[libcxx] r255851 - Add CMake option LIBCXX_CONFIGURE_IDE to allow for other IDE's.
Eric Fiselier via cfe-commits
cfe-commits at lists.llvm.org
Wed Dec 16 15:41:05 PST 2015
Author: ericwf
Date: Wed Dec 16 17:41:05 2015
New Revision: 255851
URL: http://llvm.org/viewvc/llvm-project?rev=255851&view=rev
Log:
Add CMake option LIBCXX_CONFIGURE_IDE to allow for other IDE's.
CLion needs similar configuration changes as MSVC_IDE and XCODE.
Modified:
libcxx/trunk/CMakeLists.txt
libcxx/trunk/lib/CMakeLists.txt
Modified: libcxx/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=255851&r1=255850&r2=255851&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Wed Dec 16 17:41:05 2015
@@ -42,7 +42,6 @@ if (LIBCXX_BUILT_STANDALONE AND NOT LLVM
"or -DLLVM_PATH=path/to/llvm-source-root.")
endif()
-
#===============================================================================
# Setup CMake Options
#===============================================================================
@@ -150,6 +149,13 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin
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
#===============================================================================
Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=255851&r1=255850&r2=255851&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Wed Dec 16 17:41:05 2015
@@ -11,7 +11,7 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "
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)
More information about the cfe-commits
mailing list