[Cmake-commits] CMake branch, master, updated. v3.12.1-470-g92de93b
Kitware Robot
kwrobot at kitware.com
Mon Aug 27 13:55:04 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 92de93b97486ae93fd73829c8d69e6401858acd3 (commit)
via 74b9538c2661f406e25dad364faf0cf7a7dbda84 (commit)
via 9e3aee952dacc52c94e34a8d76b60c1e797f0533 (commit)
via c68b358ce3c4eb132e7c6dd24effa83ce58a0bb9 (commit)
via e4e6b63ec96dc4a51fc336efd28e5f2b3f8d455f (commit)
via 1bd768174a848b9bc12eeff73786407631c533cf (commit)
from 363fffc736f723fc4a7bb3c8cd69e462eb9f937e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92de93b97486ae93fd73829c8d69e6401858acd3
commit 92de93b97486ae93fd73829c8d69e6401858acd3
Merge: 74b9538 c68b358
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 27 17:54:36 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 27 13:54:44 2018 -0400
Merge topic 'xcode-compiler-id-sign-identity'
c68b358ce3 Xcode: Set CODE_SIGN_IDENTITY during compiler identification
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Gregor Jasny <gjasny at googlemail.com>
Merge-request: !2299
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74b9538c2661f406e25dad364faf0cf7a7dbda84
commit 74b9538c2661f406e25dad364faf0cf7a7dbda84
Merge: 9e3aee9 e4e6b63
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 27 17:53:19 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 27 13:53:28 2018 -0400
Merge topic 'extra-gen-fix-0'
e4e6b63ec9 Extra Generator: Fix extraction of macros with value 0
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2308
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e3aee952dacc52c94e34a8d76b60c1e797f0533
commit 9e3aee952dacc52c94e34a8d76b60c1e797f0533
Merge: 363fffc 1bd7681
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 27 17:51:56 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 27 13:52:02 2018 -0400
Merge topic 'vs2017-no-default-FC'
1bd768174a VS: Avoid VS 2017 toolset default use of /FC flag
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Alberto Garcia Illera <agarciaillera at gmail.com>
Acked-by: Martin Hořeňovský <martin.horenovsky at gmail.com>
Merge-request: !2306
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c68b358ce3c4eb132e7c6dd24effa83ce58a0bb9
commit c68b358ce3c4eb132e7c6dd24effa83ce58a0bb9
Author: Rafal Parzych <rparzych at o2.pl>
AuthorDate: Thu Aug 16 20:49:16 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 24 13:58:51 2018 -0400
Xcode: Set CODE_SIGN_IDENTITY during compiler identification
If `CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY` is set then propagate
it to the compiler id test project too.
Fixes: #18292
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 16dde65..dc4d9be 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -355,6 +355,12 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
else()
set(id_development_team "")
endif()
+ if(DEFINED CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY)
+ set(id_code_sign_identity
+ "CODE_SIGN_IDENTITY = \"${CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY}\";")
+ else()
+ set(id_code_sign_identity "")
+ endif()
configure_file(${CMAKE_ROOT}/Modules/CompilerId/Xcode-3.pbxproj.in
${id_dir}/CompilerId${lang}.xcodeproj/project.pbxproj @ONLY)
unset(_ENV_MACOSX_DEPLOYMENT_TARGET)
diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in
index 94bcbf8..4686b64 100644
--- a/Modules/CompilerId/Xcode-3.pbxproj.in
+++ b/Modules/CompilerId/Xcode-3.pbxproj.in
@@ -73,6 +73,7 @@
isa = XCBuildConfiguration;
buildSettings = {
@id_development_team@
+ @id_code_sign_identity@
PRODUCT_NAME = CompilerId at id_lang@;
};
name = Debug;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4e6b63ec96dc4a51fc336efd28e5f2b3f8d455f
commit e4e6b63ec96dc4a51fc336efd28e5f2b3f8d455f
Author: ibisz <istvan.bisz at t-online.hu>
AuthorDate: Fri Aug 24 06:45:30 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 24 13:51:30 2018 -0400
Extra Generator: Fix extraction of macros with value 0
Fix logic in CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs
to handle macros with value `0`.
diff --git a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 3a72622..55e0373 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -66,10 +66,10 @@ macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines
#message(STATUS "m1: -${CMAKE_MATCH_1}- m2: -${CMAKE_MATCH_2}- m3: -${CMAKE_MATCH_3}-")
list(APPEND ${_resultDefines} "${_name}")
- if(_value)
- list(APPEND ${_resultDefines} "${_value}")
- else()
+ if ("${_value}" STREQUAL "")
list(APPEND ${_resultDefines} " ")
+ else()
+ list(APPEND ${_resultDefines} "${_value}")
endif()
endforeach()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bd768174a848b9bc12eeff73786407631c533cf
commit 1bd768174a848b9bc12eeff73786407631c533cf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 23 14:05:00 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 23 14:05:00 2018 -0400
VS: Avoid VS 2017 toolset default use of /FC flag
VS 2017 toolsets now use this flag by default if `UseFullPaths` is
not explicitly set to `false` in the .vcxproj file. Since there is
no negative form of this flag there is no way for projects to turn
it off through our flag map. Also, the Makefile and Ninja generators
do not add this flag unless it is explicitly specified by the project.
Teach our generator to set `UseFullPaths` to `false` in VS 2017
unless the project or use has explicitly specified `/FC`.
Fixes: #18261
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 56d7243..aa43457 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2490,6 +2490,16 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
if (this->MSTools) {
if (this->ProjectType == vcxproj) {
clOptions.FixExceptionHandlingDefault();
+ if (this->GlobalGenerator->GetVersion() >=
+ cmGlobalVisualStudioGenerator::VS15) {
+ // Toolsets that come with VS 2017 may now enable UseFullPaths
+ // by default and there is no negative /FC option that projects
+ // can use to switch it back. Older toolsets disable this by
+ // default anyway so this will not hurt them. If the project
+ // is using an explicit /FC option then parsing flags will
+ // replace this setting with "true" below.
+ clOptions.AddFlag("UseFullPaths", "false");
+ }
clOptions.AddFlag("PrecompiledHeader", "NotUsing");
std::string asmLocation = configName + "/";
clOptions.AddFlag("AssemblerListingLocation", asmLocation);
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineCompilerId.cmake | 6 ++++++
...keExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake | 6 +++---
Modules/CompilerId/Xcode-3.pbxproj.in | 1 +
Source/cmVisualStudio10TargetGenerator.cxx | 10 ++++++++++
4 files changed, 20 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list