[vcpkg-cmake] Fix usage of CMAKE_CXX_COMPILER_TARGET (#24101)

* Guard CMAKE_CXX_COMPILER_TARGET * Update versions
microsoft · Apr 18, 2022 · 97b723c · 97b723c
1 parent d35a986
commit 97b723c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt
@@ -111,7 +111,7 @@ endif()
 if(CMAKE_CXX_COMPILER_TARGET)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}\"")
-    else()
+    elseif(CMAKE_CXX_COMPILE_OPTIONS_TARGET)
         string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} \"${CMAKE_CXX_COMPILER_TARGET}\"")
     endif()
 endif()

diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json
@@ -1,5 +1,5 @@
 {
   "name": "vcpkg-cmake",
-  "version-date": "2022-04-07",
+  "version-date": "2022-04-12",
   "license": "MIT"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7297,7 +7297,7 @@
       "port-version": 1
     },
     "vcpkg-cmake": {
-      "baseline": "2022-04-07",
+      "baseline": "2022-04-12",
       "port-version": 0
     },
     "vcpkg-cmake-config": {

diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef4a9463f802c1cd6f8b31e560529aeaee0faff4",
+      "version-date": "2022-04-12",
+      "port-version": 0
+    },
     {
       "git-tree": "3dcb01563c0de941013579456d19ce5b0bd08a6e",
       "version-date": "2022-04-07",