diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-03-12 04:11:28 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-03-12 04:11:28 +0000 |
| commit | 496b68bd5bc14b913f46df17c4b2491a161e4b06 (patch) | |
| tree | f75f4d3fd74fad740439eb2b6eaed8c12f918f0b /libcxx/CMakeLists.txt | |
| parent | b328a046e097c9e25d0bc176014376e37a46e979 (diff) | |
| download | bcm5719-llvm-496b68bd5bc14b913f46df17c4b2491a161e4b06.tar.gz bcm5719-llvm-496b68bd5bc14b913f46df17c4b2491a161e4b06.zip | |
build: fix add_definition abuse in CMake
add_definitions is meant for adding C preprocessor definitions. Modern cmake
suggests use of the CMAKE_CXX_FLAGS for the purposes of pushing flags to the
compilation commands. Simply switch to the modern form given that we are
already requiring a new enough cmake.
llvm-svn: 203637
Diffstat (limited to 'libcxx/CMakeLists.txt')
| -rw-r--r-- | libcxx/CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index aee36f27ce8..677abaa600c 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -259,11 +259,14 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() -add_definitions( - ${LIBCXX_CXX_REQUIRED_FLAGS} - ${LIBCXX_CXX_WARNING_FLAGS} - ${LIBCXX_CXX_FEATURE_FLAGS} - ) +string(REPLACE ";" " " LIBCXX_CXX_REQUIRED_FLAGS "${LIBCXX_CXX_REQUIRED_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCXX_CXX_REQUIRED_FLAGS}") + +string(REPLACE ";" " " LIBCXX_CXX_WARNING_FLAGS "${LIBCXX_CXX_WARNING_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCXX_CXX_WARNING_FLAGS}") + +string(REPLACE ";" " " LIBCXX_CXX_FEATURE_FLAGS "${LIBCXX_CXX_FEATURE_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCXX_CXX_FEATURE_FLAGS}") #=============================================================================== # Setup Source Code |
