diff options
author | Brad King <brad.king@kitware.com> | 2019-11-05 11:31:10 -0500 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-11-05 11:31:10 -0500 |
commit | 408a3a7d5e21d6b49af5d9b3b7e59f3286cd32b7 (patch) | |
tree | 618e7dba691805187e8ab3034a300a96a890e8c1 /Modules | |
parent | 602189bb7b5f62a28e101cf0ed51572d2bf92f2f (diff) | |
parent | e331367a898c6e0afa386c52fc7bd4d84d75ec29 (diff) | |
download | cmake-408a3a7d5e21d6b49af5d9b3b7e59f3286cd32b7.tar.gz |
Merge branch 'objc-pch' into release-3.16
Merge-request: !3983
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/Compiler/GNU.cmake | 2 | ||||
-rw-r--r-- | Modules/Platform/Windows-Clang.cmake | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake index e0ff174ef8..6960571db8 100644 --- a/Modules/Compiler/GNU.cmake +++ b/Modules/Compiler/GNU.cmake @@ -13,6 +13,8 @@ include(Internal/CMakeCheckCompilerFlag) set(__pch_header_C "c-header") set(__pch_header_CXX "c++-header") +set(__pch_header_OBJC "objective-c-header") +set(__pch_header_OBJCXX "objective-c++-header") macro(__compiler_gnu lang) # Feature flags. diff --git a/Modules/Platform/Windows-Clang.cmake b/Modules/Platform/Windows-Clang.cmake index f2265534fd..02864c6b3e 100644 --- a/Modules/Platform/Windows-Clang.cmake +++ b/Modules/Platform/Windows-Clang.cmake @@ -8,9 +8,6 @@ if(__WINDOWS_CLANG) endif() set(__WINDOWS_CLANG 1) -set(__pch_header_C "c-header") -set(__pch_header_CXX "c++-header") - macro(__windows_compiler_clang_gnu lang) set(CMAKE_LIBRARY_PATH_FLAG "-L") set(CMAKE_LINK_LIBRARY_FLAG "-l") |