diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2016-11-23 17:19:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-28 18:42:46 (GMT) |
| commit | 543dcb0ada5047d789a19dbbffa9028cb1b317c7 (patch) | |
| tree | 25d0fb5c6a7a926675ee602e2706d1c073107d97 /Tests/IncludeDirectories/SystemIncludeDirectories | |
| parent | 5cfc2e926af645840c6a0464451af18f08528879 (diff) | |
| download | CMake-543dcb0ada5047d789a19dbbffa9028cb1b317c7.zip CMake-543dcb0ada5047d789a19dbbffa9028cb1b317c7.tar.gz CMake-543dcb0ada5047d789a19dbbffa9028cb1b317c7.tar.bz2 | |
Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
Revert commit v3.7.0-rc1~266^2 (Xcode: Obey SYSTEM keyword for includes,
2015-08-31). It worked for C, C++, and Swift but not for GNU Assembly
files for which Xcode has no property to set flags.
Closes: #16449
Diffstat (limited to 'Tests/IncludeDirectories/SystemIncludeDirectories')
| -rw-r--r-- | Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt index 5078f30..dcee85e 100644 --- a/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt +++ b/Tests/IncludeDirectories/SystemIncludeDirectories/CMakeLists.txt @@ -15,17 +15,10 @@ target_include_directories(upstream SYSTEM PUBLIC ) add_library(config_specific INTERFACE) -if(CMAKE_GENERATOR STREQUAL "Xcode") - # CMAKE_BUILD_TYPE does not work here for multi-config generators - target_include_directories(config_specific SYSTEM INTERFACE - "${CMAKE_CURRENT_SOURCE_DIR}/config_specific" - ) -else() - set(testConfig ${CMAKE_BUILD_TYPE}) - target_include_directories(config_specific SYSTEM INTERFACE - "$<$<CONFIG:${testConfig}>:${CMAKE_CURRENT_SOURCE_DIR}/config_specific>" - ) -endif() +set(testConfig ${CMAKE_BUILD_TYPE}) +target_include_directories(config_specific SYSTEM INTERFACE + "$<$<CONFIG:${testConfig}>:${CMAKE_CURRENT_SOURCE_DIR}/config_specific>" +) add_library(consumer consumer.cpp) target_link_libraries(consumer upstream config_specific) |