Merge topic 'fix-xcode-install-path'
61acaa12af xcode: Don't set INSTALL_PATH unless target is SHARED_LIBRARY
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7473
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index b9b91fb..0cad7ac 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -35,19 +35,19 @@
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
- VCVARSVERSION: "14.32.31326"
+ VCVARSVERSION: "14.33.31629"
.windows_vcvarsall_vs2022_x86:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x86"
- VCVARSVERSION: "14.32.31326"
+ VCVARSVERSION: "14.33.31629"
.windows_vcvarsall_vs2022_x64_arm64:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64_arm64"
- VCVARSVERSION: "14.32.31326"
+ VCVARSVERSION: "14.33.31629"
.windows_vs2022_x64_ninja:
extends:
@@ -98,7 +98,7 @@
CMAKE_CONFIGURATION: windows_vs2022_x64
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64"
- CMAKE_GENERATOR_TOOLSET: "v143,version=14.32.31326"
+ CMAKE_GENERATOR_TOOLSET: "v143,version=14.33.31629"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2019_x64:
@@ -232,7 +232,7 @@
- windows
- shell
- vs2022
- - msvc-19.32
+ - msvc-19.33
- nonconcurrent
.windows_tags_nonconcurrent_vs2022_arm64:
@@ -241,7 +241,7 @@
- windows
- shell
- vs2022
- - msvc-19.32-arm64
+ - msvc-19.33-arm64
- nonconcurrent
.windows_tags_concurrent_vs2022:
@@ -250,7 +250,7 @@
- windows
- shell
- vs2022
- - msvc-19.32
+ - msvc-19.33
- concurrent
.windows_tags_concurrent_vs2019:
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 260e61b..da06175 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,7 +1,7 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 24)
-set(CMake_VERSION_PATCH 20220816)
+set(CMake_VERSION_PATCH 20220817)
#set(CMake_VERSION_RC 0)
set(CMake_VERSION_IS_DIRTY 0)