diff options
author | Jordan Rose <jordan_rose@apple.com> | 2014-02-05 00:02:37 +0000 |
---|---|---|
committer | Jordan Rose <jordan_rose@apple.com> | 2014-02-05 00:02:37 +0000 |
commit | 1b7969eee250d4e3d12666a909971dd26adcbd77 (patch) | |
tree | 2752ac4fc39930bccad3195a1852f34ea2da82a9 | |
parent | 7e369ff2e564495211e9cc3d6224057c804621fe (diff) | |
download | llvm-1b7969eee250d4e3d12666a909971dd26adcbd77.tar.gz llvm-1b7969eee250d4e3d12666a909971dd26adcbd77.tar.bz2 llvm-1b7969eee250d4e3d12666a909971dd26adcbd77.tar.xz |
[CMake] Move -stdlib=libc++ handling into its own file.
r200744 moved this into cmake/config-ix.cmake, so that it would happen very
early in the build process. However, standalone builds of Clang and other
external projects never include this file (which is correct).
Now, -stdlib=libc++ and the LLVM_COMPILER_IS_GCC_COMPATIBLE option are
both set in a new include file, HandleLLVMStdlib, which is included by
both config-ix.cmake and HandleLLVMOptions.cmake. This preserves existing
behavior for projects relying on HandleLLVMOptions and still does the
right thing for builds of LLVM itself.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200811 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rwxr-xr-x | cmake/config-ix.cmake | 21 | ||||
-rw-r--r-- | cmake/modules/HandleLLVMOptions.cmake | 1 | ||||
-rw-r--r-- | cmake/modules/HandleLLVMStdlib.cmake | 35 |
4 files changed, 38 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7275600bc..122c47d4a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,14 +272,6 @@ option (LLVM_BUILD_DOCS "Build the llvm documentation." OFF) option (LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." ON) option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm documentation." OFF) -if( CMAKE_COMPILER_IS_GNUCXX ) - set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON) -elseif( MSVC ) - set(LLVM_COMPILER_IS_GCC_COMPATIBLE OFF) -elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) - set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON) -endif() - # All options referred to from HandleLLVMOptions have to be specified # BEFORE this include, otherwise options will not be correctly set on # first cmake run diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index c9a5044099..c58e5bd97b 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -11,6 +11,8 @@ include(CheckFunctionExists) include(CheckCXXSourceCompiles) include(TestBigEndian) +include(HandleLLVMStdlib) + if( UNIX AND NOT BEOS ) # Used by check_symbol_exists: set(CMAKE_REQUIRED_LIBRARIES m) @@ -34,25 +36,6 @@ function(check_type_exists type files variable) " ${variable}) endfunction() -function(append_if condition value) - if (${condition}) - foreach(variable ${ARGN}) - set(${variable} "${${variable}} ${value}" PARENT_SCOPE) - endforeach(variable) - endif() -endfunction() - -include(CheckCXXCompilerFlag) -if( LLVM_COMPILER_IS_GCC_COMPATIBLE ) - if( LLVM_ENABLE_LIBCXX ) - check_cxx_compiler_flag("-stdlib=libc++" CXX_SUPPORTS_STDLIB) - append_if(CXX_SUPPORTS_STDLIB "-stdlib=libc++" CMAKE_CXX_FLAGS) - append_if(CXX_SUPPORTS_STDLIB "-stdlib=libc++" CMAKE_EXE_LINKER_FLAGS) - append_if(CXX_SUPPORTS_STDLIB "-stdlib=libc++" CMAKE_SHARED_LINKER_FLAGS) - append_if(CXX_SUPPORTS_STDLIB "-stdlib=libc++" CMAKE_MODULE_LINKER_FLAGS) - endif() -endif() - # include checks check_include_file_cxx(cxxabi.h HAVE_CXXABI_H) check_include_file(dirent.h HAVE_DIRENT_H) diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake index b40103ca18..9cb39ff268 100644 --- a/cmake/modules/HandleLLVMOptions.cmake +++ b/cmake/modules/HandleLLVMOptions.cmake @@ -2,6 +2,7 @@ # options and executing the appropriate CMake commands to realize the users' # selections. +include(HandleLLVMStdlib) include(AddLLVMDefinitions) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) diff --git a/cmake/modules/HandleLLVMStdlib.cmake b/cmake/modules/HandleLLVMStdlib.cmake new file mode 100644 index 0000000000..47bb6cddc8 --- /dev/null +++ b/cmake/modules/HandleLLVMStdlib.cmake @@ -0,0 +1,35 @@ +# This CMake module is responsible for setting the standard library to libc++ +# if the user has requested it. + +if(NOT DEFINED LLVM_STDLIB_HANDLED) + set(LLVM_STDLIB_HANDLED ON) + + if(CMAKE_COMPILER_IS_GNUCXX) + set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON) + elseif( MSVC ) + set(LLVM_COMPILER_IS_GCC_COMPATIBLE OFF) + elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) + set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON) + endif() + + function(append_if condition value) + if(${condition}) + foreach(variable ${ARGN}) + set(${variable} "${${variable}} ${value}" PARENT_SCOPE) + endforeach(variable) + endif() + endfunction() + + include(CheckCXXCompilerFlag) + if(LLVM_ENABLE_LIBCXX) + if(LLVM_COMPILER_IS_GCC_COMPATIBLE) + check_cxx_compiler_flag("-stdlib=libc++" CXX_SUPPORTS_STDLIB) + append_if(CXX_SUPPORTS_STDLIB "-stdlib=libc++" CMAKE_CXX_FLAGS) + append_if(CXX_SUPPORTS_STDLIB "-stdlib=libc++" CMAKE_EXE_LINKER_FLAGS) + append_if(CXX_SUPPORTS_STDLIB "-stdlib=libc++" CMAKE_SHARED_LINKER_FLAGS) + append_if(CXX_SUPPORTS_STDLIB "-stdlib=libc++" CMAKE_MODULE_LINKER_FLAGS) + else() + message(WARNING "Not sure how to specify libc++ for this compiler") + endif() + endif() +endif() |