[Cmake-commits] CMake branch, master, updated. v3.12.2-683-gece1859
Kitware Robot
kwrobot at kitware.com
Thu Sep 20 09:35:13 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 ece1859e1e123adb2386df1c7d1ce53194f5a73f (commit)
via f082414107fd2a77c370a8d87aa589dad0e6f55d (commit)
via cf1764b395eabebcee6908f699493bf12b4b0b4b (commit)
via cfe77802795699e829105346acc2d92c791f88fa (commit)
via 63eb43f1311aedd03a4274ec4321234723f54359 (commit)
via 173d29a379b5fc4a41116486ca2af4d006188ee5 (commit)
via 7e33050558bd7807f5b718f5f0d170159cc532ee (commit)
via 83ddc4d2891a0bbb06fb1e3daa00245b3c23eddc (commit)
via 6b7b54d476a297b32f8f1521f3255052b9dda1b6 (commit)
from 2d119e53093c9489c80ce9bc3f21eadc254b6e10 (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=ece1859e1e123adb2386df1c7d1ce53194f5a73f
commit ece1859e1e123adb2386df1c7d1ce53194f5a73f
Merge: f082414 cfe7780
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 20 13:32:49 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Sep 20 09:33:56 2018 -0400
Merge topic 'doc-updates'
cfe7780279 Help: TESTS property: clarify usage.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2401
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f082414107fd2a77c370a8d87aa589dad0e6f55d
commit f082414107fd2a77c370a8d87aa589dad0e6f55d
Merge: cf1764b 63eb43f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 20 13:32:30 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Sep 20 09:33:05 2018 -0400
Merge topic 'vs-2015-max-sdk'
63eb43f131 Tests: Add VSWinStorePhone for VS 15 2017
173d29a379 Tests: Fix VSWinStorePhone to properly identify VS 14 2015
83ddc4d289 VS: Do not select a Windows SDK too high for current VS version
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2388
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf1764b395eabebcee6908f699493bf12b4b0b4b
commit cf1764b395eabebcee6908f699493bf12b4b0b4b
Merge: 2d119e5 7e33050
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 20 13:31:30 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Sep 20 09:31:57 2018 -0400
Merge topic '18375-kfreebsd-bootstrap'
7e33050558 libuv: Add kFreeBSD platform-specific files
6b7b54d476 bootstrap: Add missing libraries for kFreeBSD
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2394
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfe77802795699e829105346acc2d92c791f88fa
commit cfe77802795699e829105346acc2d92c791f88fa
Author: Marc Chevrier <marc.chevrier at gmail.com>
AuthorDate: Wed Sep 19 09:38:13 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 19 10:46:22 2018 -0400
Help: TESTS property: clarify usage.
diff --git a/Help/prop_dir/TESTS.rst b/Help/prop_dir/TESTS.rst
index c6e1d88..91acd3e 100644
--- a/Help/prop_dir/TESTS.rst
+++ b/Help/prop_dir/TESTS.rst
@@ -4,4 +4,4 @@ TESTS
List of tests.
This read-only property holds a :ref:`;-list <CMake Language Lists>` of tests
-defined so far by the :command:`add_test` command.
+defined so far, in the current directory, by the :command:`add_test` command.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63eb43f1311aedd03a4274ec4321234723f54359
commit 63eb43f1311aedd03a4274ec4321234723f54359
Author: Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Mon Aug 7 10:38:50 2017 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 19 09:40:17 2018 -0400
Tests: Add VSWinStorePhone for VS 15 2017
VS 2017 needs several components installed to support this test, so
enable it only via an explicit option that can be set on specific
builders.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7e8fef8..77a96b1 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2162,6 +2162,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
-DCMAKE_SYSTEM_VERSION=8.1
)
endif()
+ if(CMake_TEST_VSWinStorePhone_VS_2017 AND ws10_0)
+ add_test_VSWinStorePhone(vs15-store10_0-X86 "Visual Studio 15 2017" WindowsStore 10.0)
+ add_test_VSWinStorePhone(vs15-store10_0-ARM "Visual Studio 15 2017 ARM" WindowsStore 10.0)
+ add_test_VSWinStorePhone(vs15-store10_0-X64 "Visual Studio 15 2017 Win64" WindowsStore 10.0)
+ endif()
if(vs14 AND ws10_0)
add_test_VSWinStorePhone(vs14-store10_0-X86 "Visual Studio 14 2015" WindowsStore 10.0)
add_test_VSWinStorePhone(vs14-store10_0-ARM "Visual Studio 14 2015 ARM" WindowsStore 10.0)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=173d29a379b5fc4a41116486ca2af4d006188ee5
commit 173d29a379b5fc4a41116486ca2af4d006188ee5
Author: Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Mon Aug 7 10:38:50 2017 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 19 09:39:25 2018 -0400
Tests: Fix VSWinStorePhone to properly identify VS 14 2015
VS 14 2015 was only identified by the Windows 10 SDK. On machines with
only VS 2017 and the Windows 10 SDKs, this would incorrectly identify
that VS 2015 was installed. Check for VS 14 2015 with its proper
registry entry.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index a22521b..7e8fef8 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2106,7 +2106,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
set(reg_vs10 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]")
set(reg_vs11 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;InstallDir]")
set(reg_vs12 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0;InstallDir]")
- set(reg_vs14 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]")
+ set(reg_vs14 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0;InstallDir]")
set(reg_ws80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]")
set(reg_ws81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]")
set(reg_ws10_0 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\Build Tools for Windows 10;srcPath]")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e33050558bd7807f5b718f5f0d170159cc532ee
commit 7e33050558bd7807f5b718f5f0d170159cc532ee
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Sep 18 20:21:58 2018 +0200
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Tue Sep 18 20:22:55 2018 +0200
libuv: Add kFreeBSD platform-specific files
Issue 18375
diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index ba1638e..a503041 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -208,6 +208,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
)
endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")
+ list(APPEND uv_libraries
+ freebsd-glue
+ kvm
+ )
+ list(APPEND uv_headers
+ include/uv-bsd.h
+ )
+ list(APPEND uv_sources
+ src/unix/bsd-ifaddrs.c
+ src/unix/freebsd.c
+ src/unix/kqueue.c
+ src/unix/posix-hrtime.c
+ )
+endif()
+
if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
list(APPEND uv_libraries
kvm
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83ddc4d2891a0bbb06fb1e3daa00245b3c23eddc
commit 83ddc4d2891a0bbb06fb1e3daa00245b3c23eddc
Author: Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Mon Aug 7 10:38:50 2017 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 17 13:07:40 2018 -0400
VS: Do not select a Windows SDK too high for current VS version
Add an internal API for the maximum Windows 10 SDK version supported by
a toolset. For Visual Studio 14 2015 that would be the version
"10.0.14393.0".
Fixes: #17788
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index b0db146..c3ddb3e 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -212,6 +212,12 @@ bool cmGlobalVisualStudio14Generator::IsWindowsStoreToolsetInstalled() const
cmSystemTools::KeyWOW64_32);
}
+std::string cmGlobalVisualStudio14Generator::GetWindows10SDKMaxVersion() const
+{
+ // The last Windows 10 SDK version that VS 2015 can target is 10.0.14393.0.
+ return "10.0.14393.0";
+}
+
#if defined(_WIN32) && !defined(__CYGWIN__)
struct NoWindowsH
{
@@ -220,6 +226,20 @@ struct NoWindowsH
return !cmSystemTools::FileExists(p + "/um/windows.h", true);
}
};
+class WindowsSDKTooRecent
+{
+ std::string const& MaxVersion;
+
+public:
+ WindowsSDKTooRecent(std::string const& maxVersion)
+ : MaxVersion(maxVersion)
+ {
+ }
+ bool operator()(std::string const& v)
+ {
+ return cmSystemTools::VersionCompareGreater(v, MaxVersion);
+ }
+};
#endif
std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
@@ -276,6 +296,12 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
// Sort the results to make sure we select the most recent one.
std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
+ // Skip SDKs that cannot be used with our toolset.
+ std::string maxVersion = this->GetWindows10SDKMaxVersion();
+ if (!maxVersion.empty()) {
+ cmEraseIf(sdks, WindowsSDKTooRecent(maxVersion));
+ }
+
// Look for a SDK exactly matching the requested target version.
for (std::string const& i : sdks) {
if (cmSystemTools::VersionCompareEqual(i, this->SystemVersion)) {
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index 4868df0..9f5bb4e 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -37,6 +37,10 @@ protected:
// of the toolset is installed
bool IsWindowsStoreToolsetInstalled() const;
+ // Used to make sure that the Windows 10 SDK selected can work with the
+ // version of the toolset.
+ virtual std::string GetWindows10SDKMaxVersion() const;
+
const char* GetIDEVersion() override { return "14.0"; }
virtual bool SelectWindows10SDK(cmMakefile* mf, bool required);
diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index 9983a43..23fd2d5 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -258,6 +258,11 @@ bool cmGlobalVisualStudio15Generator::IsWin81SDKInstalled() const
return false;
}
+std::string cmGlobalVisualStudio15Generator::GetWindows10SDKMaxVersion() const
+{
+ return std::string();
+}
+
std::string cmGlobalVisualStudio15Generator::FindMSBuildCommand()
{
std::string msbuild;
diff --git a/Source/cmGlobalVisualStudio15Generator.h b/Source/cmGlobalVisualStudio15Generator.h
index cdc97ad..8ab63f1 100644
--- a/Source/cmGlobalVisualStudio15Generator.h
+++ b/Source/cmGlobalVisualStudio15Generator.h
@@ -52,6 +52,8 @@ protected:
// Check for a Win 8 SDK known to the registry or VS installer tool.
bool IsWin81SDKInstalled() const;
+ std::string GetWindows10SDKMaxVersion() const override;
+
std::string FindMSBuildCommand() override;
std::string FindDevEnvCommand() override;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b7b54d476a297b32f8f1521f3255052b9dda1b6
commit 6b7b54d476a297b32f8f1521f3255052b9dda1b6
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Sep 16 14:35:44 2018 +0200
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Sep 16 14:35:44 2018 +0200
bootstrap: Add missing libraries for kFreeBSD
Closes #18375
diff --git a/bootstrap b/bootstrap
index 188193d..416a3d6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1370,6 +1370,9 @@ else
uv_c_flags="${uv_c_flags} -D_GNU_SOURCE"
libs="${libs} -ldl -lrt"
;;
+ *kFreeBSD*)
+ libs="${libs} -lkvm -lfreebsd-glue"
+ ;;
*BSD*)
libs="${libs} -lkvm"
;;
-----------------------------------------------------------------------
Summary of changes:
Help/prop_dir/TESTS.rst | 2 +-
Source/cmGlobalVisualStudio14Generator.cxx | 26 ++++++++++++++++++++++++++
Source/cmGlobalVisualStudio14Generator.h | 4 ++++
Source/cmGlobalVisualStudio15Generator.cxx | 5 +++++
Source/cmGlobalVisualStudio15Generator.h | 2 ++
Tests/CMakeLists.txt | 7 ++++++-
Utilities/cmlibuv/CMakeLists.txt | 16 ++++++++++++++++
bootstrap | 3 +++
8 files changed, 63 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list