diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-09 10:21:28 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-09 10:21:28 -0400 |
| commit | 12a7e2b10c447e3ed61c2bca69f0264f7fcbdef9 (patch) | |
| tree | a54d4aee5c315f35281bd124fe9927da2cd50499 /Utilities | |
| parent | 7f268c243f49775bb6de867ee49f3b48117c68ea (diff) | |
| parent | 1763c31c3b964343b88f8f26dc2941dd8c0e1fbe (diff) | |
| download | cmake-12a7e2b10c447e3ed61c2bca69f0264f7fcbdef9.tar.gz | |
Merge topic 'apple-clang-id'
1763c31 Set policy CMP0025 to NEW while building CMake itself
aa53ee5 Add policy CMP0025 for Apple Clang compiler id compatibility
ab65862 Clang: Add separate "AppleClang" compiler id
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 74a713dd81..abf04d8b08 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -1,4 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR) +IF(POLICY CMP0025) + CMAKE_POLICY(SET CMP0025 NEW) +ENDIF() PROJECT(LIBCURL C) # Setup package meta-data diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index 8ef0e89d6d..132bfebdb3 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -56,7 +56,7 @@ SET(CMAKE_REQUIRED_FLAGS) # Disable warnings to avoid changing 3rd party code. IF("${CMAKE_C_COMPILER_ID}" MATCHES - "^(GNU|Clang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$") + "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") ELSEIF("${CMAKE_C_COMPILER_ID}" MATCHES "^(PathScale)$") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") |