[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-124-g442cb77
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 442cb77bf31c02f83c47167ef9842b7756029227 (commit) via e6897c72e7c59f7a0b82ed19c1bdb40d42f7adaa (commit) from 6646623993666ad4d18a82fd7571138a8c418046 (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=442cb77bf31c02f83c47167ef9842b7756029227 commit 442cb77bf31c02f83c47167ef9842b7756029227 Merge: 6646623 e6897c7 Author: Brad King AuthorDate: Fri Feb 15 09:21:20 2019 -0500 Commit: Brad King CommitDate: Fri Feb 15 09:21:20 2019 -0500 Merge branch 'release-3.14' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.14.0-rc1-36-ge6897c7
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, release has been updated via e6897c72e7c59f7a0b82ed19c1bdb40d42f7adaa (commit) from 113a395ee77914d7c0c9888b8730102bdde6 (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 - --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc2-97-g820424d
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 820424d95d7b10ae08affe79288ac594a561e5bd (commit)
via bd20cc29a20f087348e7724da2cbaf311626dc06 (commit)
from 160735c479535f0137c7b9a14edeccb623473f74 (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=820424d95d7b10ae08affe79288ac594a561e5bd
commit 820424d95d7b10ae08affe79288ac594a561e5bd
Merge: 160735c bd20cc2
Author: Brad King
AuthorDate: Fri Feb 15 15:04:42 2019 +
Commit: Kitware Robot
CommitDate: Fri Feb 15 10:04:49 2019 -0500
Merge topic 'systools-cleanup'
bd20cc29a2 cmSystemTools: Remove redundant cmCopyFile() and Split()
Acked-by: Kitware Robot
Merge-request: !2966
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd20cc29a20f087348e7724da2cbaf311626dc06
commit bd20cc29a20f087348e7724da2cbaf311626dc06
Author: Vitaly Stakhovsky
AuthorDate: Thu Feb 14 07:45:13 2019 -0500
Commit: Vitaly Stakhovsky
CommitDate: Fri Feb 15 09:52:29 2019 -0500
cmSystemTools: Remove redundant cmCopyFile() and Split()
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index aa75a8c..aec5a44 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -3756,7 +3756,7 @@ bool cmFileCommand::HandleCreateLinkCommand(
// Check if copy-on-error is enabled in the arguments.
if (!completed && copyOnErrorArg.IsEnabled()) {
-completed = cmSystemTools::cmCopyFile(fileName, newFileName);
+completed = cmsys::SystemTools::CopyFileAlways(fileName, newFileName);
if (!completed) {
result = "Copy failed: " + cmSystemTools::GetLastSystemError();
}
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index a5d191d..f544fa1 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -935,12 +935,6 @@ std::string cmSystemTools::FileExistsInParentDirectories(
return "";
}
-bool cmSystemTools::cmCopyFile(const std::string& source,
- const std::string& destination)
-{
- return Superclass::CopyFileAlways(source, destination);
-}
-
#ifdef _WIN32
cmSystemTools::WindowsFileRetry cmSystemTools::GetWindowsFileRetry()
{
@@ -1388,14 +1382,6 @@ cmSystemTools::FileFormat
cmSystemTools::GetFileFormat(std::string const& ext)
return cmSystemTools::UNKNOWN_FILE_FORMAT;
}
-bool cmSystemTools::Split(const char* s, std::vector& l)
-{
- std::vector temp;
- bool res = Superclass::Split(s, temp);
- l.insert(l.end(), temp.begin(), temp.end());
- return res;
-}
-
std::string cmSystemTools::ConvertToOutputPath(std::string const& path)
{
#if defined(_WIN32) && !defined(__CYGWIN__)
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index ba6de51..82e4f01 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -172,10 +172,6 @@ public:
static bool SimpleGlob(const std::string& glob,
std::vector& files, int type = 0);
- ///! Copy a file.
- static bool cmCopyFile(const std::string& source,
- const std::string& destination);
-
/** Rename a file or directory within a single disk volume (atomic
if possible). */
static bool RenameFile(const std::string& oldname,
@@ -347,9 +343,6 @@ public:
cmDuration timeout, std::vector& out,
std::vector& err);
- /** Split a string on its newlines into multiple lines. Returns
- false only if the last line stored had no newline. */
- static bool Split(const char* s, std::vector& l);
static void SetForceUnixPaths(bool v) { s_ForceUnixPaths = v; }
static bool GetForceUnixPaths() { return s_ForceUnixPaths; }
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index ff6b04b..dd29c0c 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2354,7 +2354,7 @@ int cmake::GetSystemInformation(std::vector&
args)
outFile += "/CMakeLists.txt";
// Copy file
- if (!cmSystemTools::cmCopyFile(inFile, outFile)) {
+ if (!cmsys::SystemTools::CopyFileAlways(inFile, outFile)) {
std::cerr << "Error copying file \"" << inFile << "\" to \"" << outFile
<< "\".\n";
return 1;
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 4415ba6..21802ad 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -482,7 +482,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector&
args)
// If error occurs we want to continue copying next files.
bool return_value = false;
for (std::string::size_type cc = 2; cc < args.size() - 1; cc++) {
-if (!cmSystemTools::cmCopyFile(args[cc], args.back())) {
+if
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-122-g6646623
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 6646623993666ad4d18a82fd7571138a8c418046 (commit)
via 8fc0c98f082177acadaa208117a56327fcb83d9f (commit)
from bb99ab8e539e47c05593806b495fc9cdc230570c (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=6646623993666ad4d18a82fd7571138a8c418046
commit 6646623993666ad4d18a82fd7571138a8c418046
Merge: bb99ab8 8fc0c98
Author: Brad King
AuthorDate: Fri Feb 15 12:58:51 2019 +
Commit: Kitware Robot
CommitDate: Fri Feb 15 07:58:57 2019 -0500
Merge topic 'tests-intel-fixup'
8fc0c98f08 Tests: Fix Module.WriteCompilerDetectionHeader for Intel on
Windows
Acked-by: Kitware Robot
Merge-request: !2963
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8fc0c98f082177acadaa208117a56327fcb83d9f
commit 8fc0c98f082177acadaa208117a56327fcb83d9f
Author: Brad King
AuthorDate: Thu Feb 14 09:21:35 2019 -0500
Commit: Brad King
CommitDate: Thu Feb 14 09:27:40 2019 -0500
Tests: Fix Module.WriteCompilerDetectionHeader for Intel on Windows
Fix a condition added by commit 091afa7342 (Tests: Teach tests when to
treat clang-cl as MSVC, 2018-11-06) to be specific to Clang.
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 616092d..b584e16 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -128,7 +128,8 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
endif()
# for msvc the compiler version determines which c++11 features are available.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR "x${CMAKE_CXX_SIMULATE_ID}"
STREQUAL "xMSVC")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC"
+OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND "x${CMAKE_CXX_SIMULATE_ID}"
STREQUAL "xMSVC"))
if(";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_delegating_constructors;")
list(APPEND true_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS)
list(APPEND true_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES)
---
Summary of changes:
Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.14.0-rc2, created. v3.14.0-rc2
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 annotated tag, v3.14.0-rc2 has been created at ca5d1ad4f566bcb0a55b511a0a396f1d87cb23fb (tag) tagging e6897c72e7c59f7a0b82ed19c1bdb40d42f7adaa (commit) replaces v3.14.0-rc1 tagged by Brad King on Fri Feb 15 09:12:31 2019 -0500 - Log - CMake 3.14.0-rc2 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlxmyM8WHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhD27D/0atuRTuPNBGrTwWwAeoRCas7lQ gRY9XeBHWG2DHfanR4RTcEFLEaWg520T+S03lIHsXj3/Pf2QFJxPPDN0z9ICCjK2 gSB5/d8xtiJdtrflIXelsFg6olAJZgOGbpTTeNslHgnQotkRlkKMGxtvRKfdXBqB gHvlbrrmWP1najwci0na3X6pK0t1BT8wlT75c1dBoxLZF/AxrlQ00QbAWeAEI+F8 nvhEOBnzyDi0iQJOlSHexyumVjgh3KqxyNbkXRUQZErxByfUJSdPs9O3UcfwL1DI R/IJ0ZFMzjv9S/dTPPM6aQw0YxFnj58k9Nyx2R1SF9k3N4ATlQ8N6W2yxnHfYLUc av550Tm23heSQgRXhpf3Zbi/bPczdSNE3eTH2BNfry+aQLjl9SSoduTRvqfakK0E B9bPJ6RuZcGDiWIz8CCylCRSVCA+uPlOb0+UzbRw17fcg8wB69UzD4OGr/2nbxcm RPJIIVyS0gDAjkIjPm7aKVj2H78OuZ1g75PFDVc4g53SVA1ovZrzir5SqQiQKOyQ tvcRbvEjxIGdrqdnPNejKtAMueODJcrkBHyZnOq8LSjHnGr6CUTnBjcpLzhiNU+T 0XAZv1OWuLaZ9bZqybCZIJK80E3gDiKrrL0ncEBWsgTxG67FqSYNGPETVRh0Jjnu Pav6H40HOeMD+fITIQ== =ktB7 -END PGP SIGNATURE- Brad King (26): Help: Clarify 3.14 release note about object library dependencies Merge branch 'doc-object-library-link' into release-3.14 Fix EXCLUDE_FROM_ALL on directory with an interface library Merge branch 'fix-exclude-dir-with-iface' into release-3.14 Merge branch 'ghs-updates' into release-3.14 Merge branch 'ghs-relnotes' into release-3.14 Merge branch 'FindOctave-interp-target' into release-3.14 Merge branch 'FindMatlab-version-empty' into release-3.14 Merge branch 'doc-if-legacy' into release-3.14 Merge branch 'genex-GENEX_EVAL-fix-recursion' into release-3.14 macOS: Fix addition of /usr/include to default implicit include dirs Fix regression in -I/usr/include exclusion logic cmAlgorithms: Add cmHasPrefix to match existing cmHasSuffix Update logic for sysroot in detected implicit include directories Merge branch 'fix-legacy-implicit-includes' into release-3.14 Merge branch 'fix-pointer-truncation' into release-3.14 VS: Fix validation of Windows 8.1 SDK Fortran: Factor out .mod and .smod file name construction Fortran: Thread compiler id through to internal Fortran parser Fortran: Fix submodule file names across compilers Merge branch 'fortran-submodule-names' into release-3.14 Merge branch 'vs2017-sdk81' into release-3.14 try_compile: Restore expansion of ;-list in COMPILE_DEFINITIONS Merge branch 'FindLibXml2' into release-3.14 Merge branch 'try_compile-expand-compile-defs' into release-3.14 CMake 3.14.0-rc2 Fred Baksik (2): GHS: Document usage of GHS_NO_SOURCE_GROUP_FILE Help: Update 3.14 release notes for GHS changes Juuso "Linda" Lapinlampi (1): Help: Fix elseif/endif typo Kyle Edwards (1): Merge branch 'file_create_link_release_note' into release-3.14 Marc Chevrier (1): genex: Fix erroneous handling of recursion for $ Peter Stroia-Williams (1): FindOctave: Add target for octinterp Saleem Abdulrasool (1): FindLibXml2: Document LibXml2_FOUND as preferred case Sebastian Nagel (1): FindMatlab: Tolerate empty version log file Tushar Maheshwari (1): Help: Add notes for `file(CREATE_LINK)` subcommand Zsolt Parragi (1): cmListFileLexer: Add missing include to avoid possible pointer truncation --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc2-95-g160735c
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 160735c479535f0137c7b9a14edeccb623473f74 (commit)
via f2dc10d55c24d1714d65ce990a8e7658d92d2e14 (commit)
via 3c9c91a360104b97aa6ad27934ff7603c862a2f7 (commit)
via 30faf7262561da45a79af5de9c77531091dac6b9 (commit)
via f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf (commit)
via a930de85d88891b2516c60306bb49cc85d38c5a8 (commit)
via 157570b5a2d3135e2d83f9bd2865ad666a709499 (commit)
from 442cb77bf31c02f83c47167ef9842b7756029227 (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=160735c479535f0137c7b9a14edeccb623473f74
commit 160735c479535f0137c7b9a14edeccb623473f74
Merge: f2dc10d 30faf72
Author: Kyle Edwards
AuthorDate: Fri Feb 15 15:02:02 2019 +
Commit: Kitware Robot
CommitDate: Fri Feb 15 10:02:10 2019 -0500
Merge topic 'remove_return_void'
30faf72625 Remove return from void function
Acked-by: Kitware Robot
Merge-request: !2969
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2dc10d55c24d1714d65ce990a8e7658d92d2e14
commit f2dc10d55c24d1714d65ce990a8e7658d92d2e14
Merge: 3c9c91a 157570b
Author: Brad King
AuthorDate: Fri Feb 15 14:59:44 2019 +
Commit: Kitware Robot
CommitDate: Fri Feb 15 10:00:21 2019 -0500
Merge topic 'ninja-swift-library-name'
157570b5a2 Add placeholder for Swift's library name
Acked-by: Kitware Robot
Merge-request: !2902
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c9c91a360104b97aa6ad27934ff7603c862a2f7
commit 3c9c91a360104b97aa6ad27934ff7603c862a2f7
Merge: 442cb77 f510aaf
Author: Brad King
AuthorDate: Fri Feb 15 14:59:32 2019 +
Commit: Kitware Robot
CommitDate: Fri Feb 15 09:59:40 2019 -0500
Merge topic 'update-kwsys'
f510aafbfc Merge branch 'upstream-KWSys' into update-kwsys
a930de85d8 KWSys 2019-02-14 (e270ce9f)
Acked-by: Kitware Robot
Merge-request: !2967
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30faf7262561da45a79af5de9c77531091dac6b9
commit 30faf7262561da45a79af5de9c77531091dac6b9
Author: Albert Astals Cid
AuthorDate: Thu Feb 14 17:34:06 2019 +0100
Commit: Albert Astals Cid
CommitDate: Thu Feb 14 17:34:06 2019 +0100
Remove return from void function
diff --git a/Source/cmQtAutoGeneratorMocUic.cxx
b/Source/cmQtAutoGeneratorMocUic.cxx
index ddff4cf..2959b7d 100644
--- a/Source/cmQtAutoGeneratorMocUic.cxx
+++ b/Source/cmQtAutoGeneratorMocUic.cxx
@@ -1020,20 +1020,20 @@ cmQtAutoGeneratorMocUic::WorkerT::~WorkerT()
void cmQtAutoGeneratorMocUic::WorkerT::LogInfo(
GeneratorT genType, std::string const& message) const
{
- return Log().Info(genType, message);
+ Log().Info(genType, message);
}
void cmQtAutoGeneratorMocUic::WorkerT::LogWarning(
GeneratorT genType, std::string const& message) const
{
- return Log().Warning(genType, message);
+ Log().Warning(genType, message);
}
void cmQtAutoGeneratorMocUic::WorkerT::LogFileWarning(
GeneratorT genType, std::string const& filename,
std::string const& message) const
{
- return Log().WarningFile(genType, filename, message);
+ Log().WarningFile(genType, filename, message);
}
void cmQtAutoGeneratorMocUic::WorkerT::LogError(
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf
commit f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf
Merge: e3353a0 a930de8
Author: Brad King
AuthorDate: Thu Feb 14 10:55:44 2019 -0500
Commit: Brad King
CommitDate: Thu Feb 14 10:55:44 2019 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-02-14 (e270ce9f)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a930de85d88891b2516c60306bb49cc85d38c5a8
commit a930de85d88891b2516c60306bb49cc85d38c5a8
Author: KWSys Upstream
AuthorDate: Thu Feb 14 10:13:42 2019 -0500
Commit: Brad King
CommitDate: Thu Feb 14 10:55:44 2019 -0500
KWSys 2019-02-14 (e270ce9f)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit e270ce9fc60971006e934e9d53d11be5f85efc39 (master).
Upstream Shortlog
-
Albert Astals Cid (2):
95ced423 hashtable: delete assignment operator instead of poisoning it
6090d36b Glob: Use the default copy constructor and assignment
operator
diff --git a/Glob.hxx.in b/Glob.hxx.in
index bd4a176..4c3bde1 100644
--- a/Glob.hxx.in
+++ b/Glob.hxx.in
@@ -41,17 +41,9 @@ public:
, content(c)
{
}
-Message(const Message& msg)
- : type(msg.type)
- ,
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-114-g3bc2fb5
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 3bc2fb55b46cb7daebe92bad3a5e6e9426af28b5 (commit)
via 5c26e3c5e39096d8d9d990a586f6368a33252055 (commit)
from 3411c815752470432d56c7bf265d9f99d174d082 (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=3bc2fb55b46cb7daebe92bad3a5e6e9426af28b5
commit 3bc2fb55b46cb7daebe92bad3a5e6e9426af28b5
Merge: 3411c81 5c26e3c
Author: Brad King
AuthorDate: Fri Feb 15 12:28:58 2019 +
Commit: Kitware Robot
CommitDate: Fri Feb 15 07:29:05 2019 -0500
Merge topic 'vs2017-sdk81'
5c26e3c5e3 VS: Fix validation of Windows 8.1 SDK
Acked-by: Kitware Robot
Acked-by: Dedmen Miller
Merge-request: !2962
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c26e3c5e39096d8d9d990a586f6368a33252055
commit 5c26e3c5e39096d8d9d990a586f6368a33252055
Author: Brad King
AuthorDate: Thu Feb 14 07:39:06 2019 -0500
Commit: Brad King
CommitDate: Thu Feb 14 08:25:26 2019 -0500
VS: Fix validation of Windows 8.1 SDK
The check added by commit 0a29a31161 (VS2017: Verify Windows 8.1 SDK
before using it, 2017-04-25, v3.8.1~2^2) used the wrong path to
`windows.h` within the SDK, leading to it never being detected.
Fixes: #18923
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
index 12d9304..913fc4a 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
@@ -453,7 +453,8 @@ bool
cmGlobalVisualStudioVersionedGenerator::IsWin81SDKInstalled() const
"HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\"
"Windows Kits\\Installed Roots;KitsRoot81",
win81Root, cmSystemTools::KeyWOW64_32)) {
-return cmSystemTools::FileExists(win81Root + "/um/windows.h", true);
+return cmSystemTools::FileExists(win81Root + "/include/um/windows.h",
+ true);
}
return false;
}
---
Summary of changes:
Source/cmGlobalVisualStudioVersionedGenerator.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-112-g3411c81
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 3411c815752470432d56c7bf265d9f99d174d082 (commit) via cde2596a19861e52d6ef0f98dcc0b70ba572573e (commit) from a2a903fe42f6ef54665135cac54b75d50bcd696c (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=3411c815752470432d56c7bf265d9f99d174d082 commit 3411c815752470432d56c7bf265d9f99d174d082 Merge: a2a903f cde2596 Author: Brad King AuthorDate: Fri Feb 15 12:19:41 2019 + Commit: Kitware Robot CommitDate: Fri Feb 15 07:19:51 2019 -0500 Merge topic 'try_compile-expand-compile-defs' cde2596a19 try_compile: Restore expansion of ;-list in COMPILE_DEFINITIONS Acked-by: Kitware Robot Merge-request: !2965 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cde2596a19861e52d6ef0f98dcc0b70ba572573e commit cde2596a19861e52d6ef0f98dcc0b70ba572573e Author: Brad King AuthorDate: Thu Feb 14 08:16:20 2019 -0500 Commit: Brad King CommitDate: Fri Feb 15 06:21:19 2019 -0500 try_compile: Restore expansion of ;-list in COMPILE_DEFINITIONS The quoting added by commit 8c5221fb1f (try_compile: Preserve special characters in COMPILE_DEFINITIONS, 2019-01-21, v3.14.0-rc1~108^2~3) broke the case that the `COMPILE_DEFINITIONS` value contains a `;`. Without the quoting the `;` would be generated literally in an unquoted argument in the test `CMakeLists.txt` file and would then be expanded. With quoting the `;` is preserved, which is not the old behavior. Fix this by expanding the `;`-list ahead of time. Add test cases for behavior with both `#` and `;`. This was noticed with the PGI compiler where we set `CMAKE_CXX*_STANDARD_COMPILE_OPTION` to values like `--c++17;-A`. The symptom had also been observed while preparing commit ef8f237686 (ParseImplicitIncludeInfo: add SunPro Fortran and PGI compiler, Cray fix, 2019-01-29, v3.14.0-rc1~26^2~2) but was not recognized at the time as a regression. Revert the workaround added by that commit. Fixes: #18919 diff --git a/Modules/Compiler/Cray-C.cmake b/Modules/Compiler/Cray-C.cmake index b3c96ee..d34154c 100644 --- a/Modules/Compiler/Cray-C.cmake +++ b/Modules/Compiler/Cray-C.cmake @@ -8,13 +8,13 @@ string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -DNDEBUG") string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -DNDEBUG") if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.1) - set(CMAKE_C90_STANDARD_COMPILE_OPTION "-h noc99,conform") - set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-h noc99,gnu") - set(CMAKE_C99_STANDARD_COMPILE_OPTION "-h c99,conform") - set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-h c99,gnu") + set(CMAKE_C90_STANDARD_COMPILE_OPTION -h noc99,conform) + set(CMAKE_C90_EXTENSION_COMPILE_OPTION -h noc99,gnu) + set(CMAKE_C99_STANDARD_COMPILE_OPTION -h c99,conform) + set(CMAKE_C99_EXTENSION_COMPILE_OPTION -h c99,gnu) if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.5) -set(CMAKE_C11_STANDARD_COMPILE_OPTION "-h std=c11,conform") -set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-h std=c11,gnu") +set(CMAKE_C11_STANDARD_COMPILE_OPTION -h std=c11,conform) +set(CMAKE_C11_EXTENSION_COMPILE_OPTION -h std=c11,gnu) endif () endif () diff --git a/Modules/Compiler/Cray-CXX.cmake b/Modules/Compiler/Cray-CXX.cmake index bbb5718..85a3167 100644 --- a/Modules/Compiler/Cray-CXX.cmake +++ b/Modules/Compiler/Cray-CXX.cmake @@ -8,15 +8,15 @@ string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -DNDEBUG") string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -DNDEBUG") if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.1) - set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-h conform") - set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-h gnu") + set(CMAKE_CXX98_STANDARD_COMPILE_OPTION -h conform) + set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -h gnu) if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.4) -set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-h std=c++11") -set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-h std=c++11,gnu") +set(CMAKE_CXX11_STANDARD_COMPILE_OPTION -h std=c++11) +set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -h std=c++11,gnu) endif() if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.6) -set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-h std=c++14") -set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-h std=c++14,gnu") +set(CMAKE_CXX14_STANDARD_COMPILE_OPTION -h std=c++14) +set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION -h std=c++14,gnu) endif () endif () diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index bd110ec..eb52895 100644 ---
[Cmake-commits] CMake branch, release, updated. v3.14.0-rc1-35-g113a395
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, release has been updated via 113a395ee77914d7c0c9888b8730102bdde6 (commit) via dac6cf1b99f6f8a7648b19de52a1d5ffcd2a0299 (commit) via fd86a4de04d10334f061570c6c0fcc21e18f9322 (commit) via cde2596a19861e52d6ef0f98dcc0b70ba572573e (commit) via 9d3710affecc45a73bae5a245d2235f8c818dab9 (commit) via 5c26e3c5e39096d8d9d990a586f6368a33252055 (commit) from 2f51f281a8c9684c25cf97499a4382e1b5ae68b9 (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 - --- Summary of changes: Modules/Compiler/Cray-C.cmake | 12 +- Modules/Compiler/Cray-CXX.cmake | 12 +- Modules/FindLibXml2.cmake | 2 +- Source/cmCoreTryCompile.cxx | 2 +- Source/cmGlobalVisualStudioVersionedGenerator.cxx | 3 ++- Tests/TryCompile/CMakeLists.txt | 29 +++ Tests/TryCompile/check_a_b.c | 10 7 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 Tests/TryCompile/check_a_b.c hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-120-gbb99ab8
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 bb99ab8e539e47c05593806b495fc9cdc230570c (commit) via 029abf9733e15bdecfc166a0ca7ec8c384104adb (commit) via 113a395ee77914d7c0c9888b8730102bdde6 (commit) via dac6cf1b99f6f8a7648b19de52a1d5ffcd2a0299 (commit) via fd86a4de04d10334f061570c6c0fcc21e18f9322 (commit) via 9d3710affecc45a73bae5a245d2235f8c818dab9 (commit) from 3bc2fb55b46cb7daebe92bad3a5e6e9426af28b5 (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=bb99ab8e539e47c05593806b495fc9cdc230570c commit bb99ab8e539e47c05593806b495fc9cdc230570c Merge: 029abf9 113a395 Author: Brad King AuthorDate: Fri Feb 15 07:45:14 2019 -0500 Commit: Brad King CommitDate: Fri Feb 15 07:45:14 2019 -0500 Merge branch 'release-3.14' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=029abf9733e15bdecfc166a0ca7ec8c384104adb commit 029abf9733e15bdecfc166a0ca7ec8c384104adb Merge: 3bc2fb5 fd86a4d Author: Brad King AuthorDate: Fri Feb 15 12:44:27 2019 + Commit: Kitware Robot CommitDate: Fri Feb 15 07:44:34 2019 -0500 Merge topic 'FindLibXml2' fd86a4de04 FindLibXml2: Document LibXml2_FOUND as preferred case Acked-by: Kitware Robot Merge-request: !2970 --- Summary of changes: Modules/FindLibXml2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc2-98-g657b309
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 657b30905a9d03869c99064872ec715c9934312a (commit) from 820424d95d7b10ae08affe79288ac594a561e5bd (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=657b30905a9d03869c99064872ec715c9934312a commit 657b30905a9d03869c99064872ec715c9934312a Author: Kitware Robot AuthorDate: Sat Feb 16 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Sat Feb 16 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e69ceb9..ceee9cd 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 14) -set(CMake_VERSION_PATCH 20190215) +set(CMake_VERSION_PATCH 20190216) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
