[Cmake-commits] CMake branch, master, updated. v3.14.0-rc3-270-g6873e98
Kitware Robot
kwrobot at kitware.com
Mon Mar 4 08:43:06 EST 2019
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 6873e984869d7f0f96cc8d93ebe76413d1b14b36 (commit)
via 80898a49d9c60f7f14c1135fe8eb3ba3b162f5fe (commit)
via 70d204410af9745181ca3f9bc5c80e059f606fa8 (commit)
via dbd3b1ac90b70f31f10488a97ec72c6a435106ec (commit)
via 5c0ef417b8a85546e50f7107b0038cbb7d108d20 (commit)
via 8e3358336dba2af42279c16a277116fc8fdfb826 (commit)
via 77439d97fe66804f4cb69792bec5cbb6f5bb6e93 (commit)
via 0b82f56ac69f2140cc05e7bdd4564ebf87ea6c6f (commit)
via e53a968ed582e28522b65c0f4ca00741294425b8 (commit)
via 1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3 (commit)
via fa339ced67d14bb608b2a71c37c3b99d90941d47 (commit)
from d1558fbf3ab770b8691a8548a297d1c48fe666eb (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=6873e984869d7f0f96cc8d93ebe76413d1b14b36
commit 6873e984869d7f0f96cc8d93ebe76413d1b14b36
Merge: 80898a4 e53a968
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 4 13:42:40 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 4 08:42:49 2019 -0500
Merge topic 'llvm-rc'
e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS
1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand
fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3007
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80898a49d9c60f7f14c1135fe8eb3ba3b162f5fe
commit 80898a49d9c60f7f14c1135fe8eb3ba3b162f5fe
Merge: 70d2044 5c0ef41
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 4 08:37:36 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 4 08:37:36 2019 -0500
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70d204410af9745181ca3f9bc5c80e059f606fa8
commit 70d204410af9745181ca3f9bc5c80e059f606fa8
Merge: dbd3b1a 8e33583
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 4 13:35:53 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 4 08:36:29 2019 -0500
Merge topic 'FindPython-NumPy-fix-include-dir'
8e3358336d FindPython: Fix NumPy component include directory
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3053
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbd3b1ac90b70f31f10488a97ec72c6a435106ec
commit dbd3b1ac90b70f31f10488a97ec72c6a435106ec
Merge: d1558fb 0b82f56
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 4 13:35:38 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 4 08:35:46 2019 -0500
Merge topic 'vs-fortran-rc'
0b82f56ac6 VS: Fix Fortran target type selection with RC sources
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3050
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e53a968ed582e28522b65c0f4ca00741294425b8
commit e53a968ed582e28522b65c0f4ca00741294425b8
Author: Zsolt Parragi <zsolt.parragi at cancellar.hu>
AuthorDate: Fri Mar 1 14:11:01 2019 +0100
Commit: Zsolt Parragi <zsolt.parragi at cancellar.hu>
CommitDate: Fri Mar 1 14:11:01 2019 +0100
MSVC: Use -D instead of /D in RC_FLAGS
llvm-rc can't handle definitions given with /D and without a space.
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 2daf313..0e11790 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -374,10 +374,12 @@ macro(__windows_compiler_msvc_enable_rc flags)
set(CMAKE_RC_COMPILER_INIT rc)
endif()
if(NOT CMAKE_RC_FLAGS_INIT)
- string(APPEND CMAKE_RC_FLAGS_INIT " ${flags}")
+ # llvm-rc fails when flags are specified with /D and no space after
+ string(REPLACE " /D" " -D" fixed_flags " ${flags}")
+ string(APPEND CMAKE_RC_FLAGS_INIT " ${fixed_flags}")
endif()
if(NOT CMAKE_RC_FLAGS_DEBUG_INIT)
- string(APPEND CMAKE_RC_FLAGS_DEBUG_INIT " /D_DEBUG")
+ string(APPEND CMAKE_RC_FLAGS_DEBUG_INIT " -D_DEBUG")
endif()
enable_language(RC)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3
commit 1a281a1acdcce3d6ce5a2a37fc4e0f6ab77ff0c3
Author: Zsolt Parragi <zsolt.parragi at cancellar.hu>
AuthorDate: Thu Feb 21 20:00:38 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 27 08:39:02 2019 -0500
RC: Pass output file in a way that llvm-rc 7 and below understand
Prior to LLVM 8.0, `llvm-rc` does not recognize `/fo` without a space
after it. Add the space unconditionally because MS `rc` accepts it too.
Issue: #18957
diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake
index 1227fdf..7bf6567 100644
--- a/Modules/CMakeRCInformation.cmake
+++ b/Modules/CMakeRCInformation.cmake
@@ -32,7 +32,7 @@ set(CMAKE_INCLUDE_FLAG_RC "-I")
# compile a Resource file into an object file
if(NOT CMAKE_RC_COMPILE_OBJECT)
set(CMAKE_RC_COMPILE_OBJECT
- "<CMAKE_RC_COMPILER> <DEFINES> <INCLUDES> <FLAGS> /fo<OBJECT> <SOURCE>")
+ "<CMAKE_RC_COMPILER> <DEFINES> <INCLUDES> <FLAGS> /fo <OBJECT> <SOURCE>")
endif()
# set this variable so we can avoid loading this more than once.
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 1a10666..19d0d38 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -276,7 +276,7 @@ int main()
std::string clrest = rest;
// rc: /fo x.dir\x.rc.res -> cl: /out:x.dir\x.rc.res.dep.obj
- clrest = replace(clrest, "/fo", "/out:");
+ clrest = replace(clrest, "/fo ", "/out:");
clrest = replace(clrest, objfile, objfile + ".dep.obj ");
cl = "\"" + cl + "\" /P /DRC_INVOKED /TC ";
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index adfce37..28f5e08 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1830,7 +1830,8 @@ int cmVSLink::LinkIncremental()
// Compile the resource file.
std::vector<std::string> rcCommand;
rcCommand.push_back(this->RcPath.empty() ? "rc" : this->RcPath);
- rcCommand.push_back("/fo" + this->ManifestFileRes);
+ rcCommand.emplace_back("/fo");
+ rcCommand.push_back(this->ManifestFileRes);
rcCommand.push_back(this->ManifestFileRC);
if (!RunCommand("RC Pass 1", rcCommand, this->Verbose, FORMAT_DECIMAL)) {
return -1;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa339ced67d14bb608b2a71c37c3b99d90941d47
commit fa339ced67d14bb608b2a71c37c3b99d90941d47
Author: Zsolt Parragi <zsolt.parragi at cancellar.hu>
AuthorDate: Fri Feb 22 19:22:28 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 27 08:31:46 2019 -0500
CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc
`llvm-rc` does not support them as of version 8.
diff --git a/Source/CMakeVersion.rc.in b/Source/CMakeVersion.rc.in
index 22b4a36..762d9bb 100644
--- a/Source/CMakeVersion.rc.in
+++ b/Source/CMakeVersion.rc.in
@@ -1,25 +1,16 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#define VER_FILEVERSION @CMake_RCVERSION@
-#define VER_FILEVERSION_STR "@CMake_RCVERSION_STR@\0"
-
-#define VER_PRODUCTVERSION @CMake_RCVERSION@
-#define VER_PRODUCTVERSION_STR "@CMake_RCVERSION_STR@\0"
-
-/* Version-information resource identifier. */
-#define VS_VERSION_INFO 1
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION VER_FILEVERSION
-PRODUCTVERSION VER_PRODUCTVERSION
+1 VERSIONINFO
+FILEVERSION @CMake_RCVERSION@
+PRODUCTVERSION @CMake_RCVERSION@
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
- VALUE "FileVersion", VER_FILEVERSION_STR
- VALUE "ProductVersion", VER_PRODUCTVERSION_STR
+ VALUE "FileVersion", "@CMake_RCVERSION_STR@\0"
+ VALUE "ProductVersion", "@CMake_RCVERSION_STR@\0"
END
END
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeRCInformation.cmake | 2 +-
Modules/FindPython/Support.cmake | 3 +--
Modules/Platform/Windows-MSVC.cmake | 6 ++++--
Source/CMakeVersion.rc.in | 19 +++++--------------
Source/cmGlobalVisualStudioGenerator.cxx | 4 ++++
Source/cmcldeps.cxx | 2 +-
Source/cmcmd.cxx | 3 ++-
Tests/FindPython/NumPy/arraytest.c | 2 +-
Tests/FortranOnly/CMakeLists.txt | 8 +++++++-
.../vtkIncluded.cxx => FortranOnly/testRC.rc} | 0
10 files changed, 26 insertions(+), 23 deletions(-)
copy Tests/{Wrapping/vtkIncluded.cxx => FortranOnly/testRC.rc} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list