diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-12-16 23:41:05 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-12-16 23:41:05 +0000 |
| commit | 6627c70df7b1e124d716503c3d2ebeb8ce9d07a9 (patch) | |
| tree | 114073345e06ab51d0e477882059c354ed800c59 | |
| parent | 6192c122f4b183f9bc54b473c2c0e3e9921a0faf (diff) | |
| download | bcm5719-llvm-6627c70df7b1e124d716503c3d2ebeb8ce9d07a9.tar.gz bcm5719-llvm-6627c70df7b1e124d716503c3d2ebeb8ce9d07a9.zip | |
Add CMake option LIBCXX_CONFIGURE_IDE to allow for other IDE's.
CLion needs similar configuration changes as MSVC_IDE and XCODE.
llvm-svn: 255851
| -rw-r--r-- | libcxx/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 8b60fb15e99..e6c96f64711 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -42,7 +42,6 @@ if (LIBCXX_BUILT_STANDALONE AND NOT LLVM_FOUND) "or -DLLVM_PATH=path/to/llvm-source-root.") endif() - #=============================================================================== # Setup CMake Options #=============================================================================== @@ -150,6 +149,13 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT LIBCXX_OVERRIDE_DARWIN_INSTALL endif() endif() +set(LIBCXX_CONFIGURE_IDE_DEFAULT OFF) +if (XCODE OR MSVC_IDE) + set(LIBCXX_CONFIGURE_IDE_DEFAULT ON) +endif() +option(LIBCXX_CONFIGURE_IDE "Configure libcxx for use within an IDE" + ${LIBCXX_CONFIGURE_IDE_DEFAULT}) + #=============================================================================== # Check option configurations #=============================================================================== diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index 1c8af3e6aa5..d6a35f8eba2 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -11,7 +11,7 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS") endif() # Add all the headers to the project for IDEs. -if (MSVC_IDE OR XCODE) +if (LIBCXX_CONFIGURE_IDE) file(GLOB_RECURSE LIBCXX_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/*) if(WIN32) file( GLOB LIBCXX_WIN32_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/support/win32/*.h) |
