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 720253393c42d64118faf92a56949bfa271a0424 (commit)
via ec4d70b564f8ac2928cf27aaa10d57ac2a8226bc (commit)
via d8e90be04df9d10a2b635323ccf421f1822ade8c (commit)
via 7e1c3b36455df9403b88920586453f0bbabacaca (commit)
via 82fec3784b8b89bd98ddf2c7462bfab11e6cbca4 (commit)
via 0d025f75c14c0f5a7b7199a0712c958f5703c24e (commit)
via dd7ba6ff19ae34aa748240fad02ce006e4425cab (commit)
via 42bc67bd43ca67c98dc33f8cb8e2f4ee3884697f (commit)
via d03a6fc8578ac2b4191a74c8638d58b7f92ec6f1 (commit)
via fcedf8e5528d711f1e4b765809da018d5adb2abd (commit)
via fd28e24947af12f661516dc2b942f2f1a8f586c4 (commit)
via 3a7f493b7b92eeead6841c393d7bbed62b52cbc9 (commit)
via 9ef1e13bcccd46c822ee813017601781bbe9a43d (commit)
via 540a175d2059e59fc0c5c8b8d5812c89639b27e3 (commit)
via 2d0b0e2b9d50aa14ccf345c727b2da73dfba9bd6 (commit)
via 4a871d51a3fa05000ea7a03587cd995783988c36 (commit)
from ebee9ff160569481aed4e0db5cbb3f3ac925c044 (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=720253393c42d64118faf92a56949bfa271a0424
commit 720253393c42d64118faf92a56949bfa271a0424
Merge: ec4d70b fd28e24
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 13:10:43 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri May 31 09:10:51 2019 -0400
Merge topic 'ninja-cmcldeps'
fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3404
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec4d70b564f8ac2928cf27aaa10d57ac2a8226bc
commit ec4d70b564f8ac2928cf27aaa10d57ac2a8226bc
Merge: d8e90be 3a7f493
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 13:09:03 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri May 31 09:09:30 2019 -0400
Merge topic 'update-kwsys'
3a7f493b7b Merge branch 'upstream-KWSys' into update-kwsys
9ef1e13bcc KWSys 2019-05-30 (f892bacf)
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3401
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8e90be04df9d10a2b635323ccf421f1822ade8c
commit d8e90be04df9d10a2b635323ccf421f1822ade8c
Merge: 7e1c3b3 4a871d5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 13:08:30 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri May 31 09:08:40 2019 -0400
Merge topic 'FindPython-remove-erroneous-code'
4a871d51a3 FindPython*: remove erroneous code
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3400
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e1c3b36455df9403b88920586453f0bbabacaca
commit 7e1c3b36455df9403b88920586453f0bbabacaca
Merge: 82fec37 dd7ba6f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 09:07:44 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri May 31 09:07:44 2019 -0400
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82fec3784b8b89bd98ddf2c7462bfab11e6cbca4
commit 82fec3784b8b89bd98ddf2c7462bfab11e6cbca4
Merge: 0d025f7 42bc67b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 13:03:25 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri May 31 09:04:47 2019 -0400
Merge topic 'vs-depends-dedup'
42bc67bd43 VS: De-duplicate custom command dependencies
d03a6fc857 VS: Clarify name of custom commands AdditionalInputs variable
fcedf8e552 VS: Isolate custom command input/output generation scopes
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3388
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d025f75c14c0f5a7b7199a0712c958f5703c24e
commit 0d025f75c14c0f5a7b7199a0712c958f5703c24e
Merge: ebee9ff 2d0b0e2
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 13:03:16 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri May 31 09:03:28 2019 -0400
Merge topic 'implicit-includes-CPATH'
2d0b0e2b9d Do not exclude include directories made implicit by CPATH
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3395
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd28e24947af12f661516dc2b942f2f1a8f586c4
commit fd28e24947af12f661516dc2b942f2f1a8f586c4
Author: Marc-André Moreau <marcandre.mor...@gmail.com>
AuthorDate: Thu May 30 13:03:37 2019 -0400
Commit: Marc-André Moreau <marcandre.mor...@gmail.com>
CommitDate: Thu May 30 13:11:34 2019 -0400
Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC
diff --git a/Modules/Platform/Windows-MSVC.cmake
b/Modules/Platform/Windows-MSVC.cmake
index 776b209..7a83859 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -421,5 +421,7 @@ macro(__windows_compiler_msvc_enable_rc flags)
endif()
enable_language(RC)
- set(CMAKE_NINJA_CMCLDEPS_RC 1)
+ if(NOT DEFINED CMAKE_NINJA_CMCLDEPS_RC)
+ set(CMAKE_NINJA_CMCLDEPS_RC 1)
+ endif()
endmacro()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a7f493b7b92eeead6841c393d7bbed62b52cbc9
commit 3a7f493b7b92eeead6841c393d7bbed62b52cbc9
Merge: c68efd1 9ef1e13
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu May 30 09:31:35 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu May 30 09:31:35 2019 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-05-30 (f892bacf)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ef1e13bcccd46c822ee813017601781bbe9a43d
commit 9ef1e13bcccd46c822ee813017601781bbe9a43d
Author: KWSys Upstream <kwro...@kitware.com>
AuthorDate: Thu May 30 09:29:16 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu May 30 09:31:29 2019 -0400
KWSys 2019-05-30 (f892bacf)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit f892bacf6c563b1f6fb843ffb623b434bc2ded4f (master).
Upstream Shortlog
-----------------
Zsolt Parragi (1):
887b1da5 Fixing issues when building with clang 8.0 on Windows
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 120b5de..79e813e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,14 @@ SET_PROPERTY(DIRECTORY
if(KWSYS_CXX_STANDARD)
set(CMAKE_CXX_STANDARD "${KWSYS_CXX_STANDARD}")
elseif(NOT DEFINED CMAKE_CXX_STANDARD AND NOT DEFINED KWSYS_CXX_STANDARD)
- set(CMAKE_CXX_STANDARD 11)
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
+ AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC"
+ AND "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU"
+ )
+ set(CMAKE_CXX_STANDARD 14)
+ else()
+ set(CMAKE_CXX_STANDARD 11)
+ endif()
endif()
# Select library components.
@@ -1005,7 +1012,8 @@ ENDIF()
ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}")
# Disable deprecation warnings for standard C functions.
-IF(MSVC OR (WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Intel"))
+IF(MSVC OR (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "Intel" OR
+ (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND "x${CMAKE_CXX_SIMULATE_ID}"
STREQUAL "xMSVC"))))
ADD_DEFINITIONS(
-D_CRT_NONSTDC_NO_DEPRECATE
-D_CRT_SECURE_NO_DEPRECATE
diff --git a/ProcessWin32.c b/ProcessWin32.c
index 2a2e737..68c5218 100644
--- a/ProcessWin32.c
+++ b/ProcessWin32.c
@@ -117,7 +117,6 @@ static kwsysProcessTime
kwsysProcessTimeAdd(kwsysProcessTime in1,
kwsysProcessTime in2);
static kwsysProcessTime kwsysProcessTimeSubtract(kwsysProcessTime in1,
kwsysProcessTime in2);
-static void kwsysProcessSetExitException(kwsysProcess* cp, int code);
static void kwsysProcessSetExitExceptionByIndex(kwsysProcess* cp, int code,
int idx);
static void kwsysProcessKillTree(int pid);
@@ -358,13 +357,20 @@ kwsysProcess* kwsysProcess_New(void)
# pragma warning(push)
# ifdef __INTEL_COMPILER
# pragma warning(disable : 1478)
+# elif defined __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wdeprecated-declarations"
# else
# pragma warning(disable : 4996)
# endif
#endif
GetVersionEx(&osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
-# pragma warning(pop)
+# ifdef __clang__
+# pragma clang diagnostic pop
+# else
+# pragma warning(pop)
+# endif
#endif
if (osv.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
/* Win9x no longer supported. */
@@ -2269,13 +2275,20 @@ static kwsysProcess_List* kwsysProcess_List_New(void)
# pragma warning(push)
# ifdef __INTEL_COMPILER
# pragma warning(disable : 1478)
+# elif defined __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wdeprecated-declarations"
# else
# pragma warning(disable : 4996)
# endif
#endif
GetVersionEx(&osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
-# pragma warning(pop)
+# ifdef __clang__
+# pragma clang diagnostic pop
+# else
+# pragma warning(pop)
+# endif
#endif
self->NT4 =
(osv.dwPlatformId == VER_PLATFORM_WIN32_NT && osv.dwMajorVersion < 5) ? 1
@@ -2659,8 +2672,8 @@ static int kwsysProcessesAdd(HANDLE hProcess, DWORD
dwProcessid,
newSize = kwsysProcesses.Size ? kwsysProcesses.Size * 2 : 4;
/* Try allocating the new block of memory. */
- if (newArray = (kwsysProcessInstance*)malloc(
- newSize * sizeof(kwsysProcessInstance))) {
+ if ((newArray = (kwsysProcessInstance*)malloc(
+ newSize * sizeof(kwsysProcessInstance)))) {
/* Copy the old process handles to the new memory. */
if (kwsysProcesses.Count > 0) {
memcpy(newArray, kwsysProcesses.Processes,
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 7b697c4..7dc6cf4 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -5205,6 +5205,9 @@ bool SystemInformationImplementation::QueryOSInformation()
# pragma warning(push)
# ifdef __INTEL_COMPILER
# pragma warning(disable : 1478)
+# elif defined __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wdeprecated-declarations"
# else
# pragma warning(disable : 4996)
# endif
@@ -5217,7 +5220,11 @@ bool
SystemInformationImplementation::QueryOSInformation()
}
}
# ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
-# pragma warning(pop)
+# ifdef __clang__
+# pragma clang diagnostic pop
+# else
+# pragma warning(pop)
+# endif
# endif
switch (osvi.dwPlatformId) {
diff --git a/SystemTools.cxx b/SystemTools.cxx
index e756cdc..2135913 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4366,6 +4366,9 @@ std::string
SystemTools::GetOperatingSystemNameAndVersion()
# pragma warning(push)
# ifdef __INTEL_COMPILER
# pragma warning(disable : 1478)
+# elif defined __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wdeprecated-declarations"
# else
# pragma warning(disable : 4996)
# endif
@@ -4375,7 +4378,11 @@ std::string
SystemTools::GetOperatingSystemNameAndVersion()
return 0;
}
# ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
-# pragma warning(pop)
+# ifdef __clang__
+# pragma clang diagnostic pop
+# else
+# pragma warning(pop)
+# endif
# endif
switch (osvi.dwPlatformId) {
diff --git a/testConsoleBuf.cxx b/testConsoleBuf.cxx
index 1549440..b6ad118 100644
--- a/testConsoleBuf.cxx
+++ b/testConsoleBuf.cxx
@@ -499,6 +499,9 @@ static int testConsole()
# pragma warning(push)
# ifdef __INTEL_COMPILER
# pragma warning(disable : 1478)
+# elif defined __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wdeprecated-declarations"
# else
# pragma warning(disable : 4996)
# endif
@@ -506,7 +509,11 @@ static int testConsole()
const bool isVistaOrGreater =
LOBYTE(LOWORD(GetVersion())) >= HIBYTE(_WIN32_WINNT_VISTA);
# ifdef KWSYS_WINDOWS_DEPRECATED_GetVersion
-# pragma warning(pop)
+# ifdef __clang__
+# pragma clang diagnostic pop
+# else
+# pragma warning(pop)
+# endif
# endif
if (!isVistaOrGreater) {
if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Console", 0, KEY_READ | KEY_WRITE,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a871d51a3fa05000ea7a03587cd995783988c36
commit 4a871d51a3fa05000ea7a03587cd995783988c36
Author: Marc Chevrier <marc.chevr...@gmail.com>
AuthorDate: Thu May 30 13:40:46 2019 +0200
Commit: Marc Chevrier <marc.chevr...@gmail.com>
CommitDate: Thu May 30 13:40:46 2019 +0200
FindPython*: remove erroneous code
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 83fd1c5..5d39240 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -1315,8 +1315,6 @@ if ("Development" IN_LIST
${_PYTHON_PREFIX}_FIND_COMPONENTS
HINTS ${_${_PYTHON_PREFIX}_HINTS}
PATHS ${__${_PYTHON_PREFIX}_REGISTRY_PATHS}
PATH_SUFFIXES lib libs)
- endif()
- if (${_PYTHON_PREFIX}_LIBRARY_RELEASE)
# extract version from library name
if (${_PYTHON_PREFIX}_LIBRARY_DEBUG MATCHES "python([23])([0-9]+)")
-----------------------------------------------------------------------
Summary of changes:
Help/release/3.14.rst | 8 +++
Modules/FindPython/Support.cmake | 2 -
Modules/Platform/Windows-MSVC.cmake | 4 +-
Source/cmLocalGenerator.cxx | 28 ++++++++--
Source/cmLocalGenerator.h | 2 +
Source/cmVisualStudio10TargetGenerator.cxx | 62 +++++++++++++++-------
Source/cmVisualStudio10TargetGenerator.h | 3 +-
Source/kwsys/CMakeLists.txt | 12 ++++-
Source/kwsys/ProcessWin32.c | 23 ++++++--
Source/kwsys/SystemInformation.cxx | 9 +++-
Source/kwsys/SystemTools.cxx | 9 +++-
Source/kwsys/testConsoleBuf.cxx | 9 +++-
Tests/CMakeLists.txt | 18 +++++++
Tests/IncludeDirectoriesCPATH/CMakeLists.txt | 22 ++++++++
.../consumer.cpp} | 3 +-
.../viacpath}/systemlib.h | 1 -
16 files changed, 176 insertions(+), 39 deletions(-)
create mode 100644 Tests/IncludeDirectoriesCPATH/CMakeLists.txt
copy Tests/{IncludeDirectories/SystemIncludeDirectories/imported_consumer.cpp
=> IncludeDirectoriesCPATH/consumer.cpp} (76%)
copy Tests/{IncludeDirectories/SystemIncludeDirectories/systemlib_header_only
=> IncludeDirectoriesCPATH/viacpath}/systemlib.h (99%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
