generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add CMake option LIBCXX_CONFIGURE_IDE to allow for other IDE's.

Browse Source 
CLion needs similar configuration changes as MSVC_IDE and XCODE.


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@255851 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2015-12-16 23:41:05 +00:00
parent c8f54c2396
commit 85df7a8775
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -42,7 +42,6 @@ if (LIBCXX_BUILT_STANDALONE AND NOT LLVM_FOUND)
"or -DLLVM_PATH=path/to/llvm-source-root.") "or -DLLVM_PATH=path/to/llvm-source-root.")
endif() endif()
#=============================================================================== #===============================================================================
# Setup CMake Options # Setup CMake Options
#=============================================================================== #===============================================================================
@ -150,6 +149,13 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT LIBCXX_OVERRIDE_DARWIN_INSTALL
endif() endif()
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 # Check option configurations
#=============================================================================== #===============================================================================

2
lib/CMakeLists.txt
View File

@ -11,7 +11,7 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
endif() endif()
# Add all the headers to the project for IDEs. # 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/*) file(GLOB_RECURSE LIBCXX_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/*)
if(WIN32) if(WIN32)
file( GLOB LIBCXX_WIN32_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/support/win32/*.h) file( GLOB LIBCXX_WIN32_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/support/win32/*.h)