fix stuff

microsoft · Neumann-A · Nov 12, 2024 · Nov 12, 2024 · Nov 13, 2024 · Nov 14, 2024
commit 574cd1af166defb732d6c86aded0f2c1e805b553
diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake
@@ -65,10 +65,12 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/fltk-config")
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
     file(RENAME "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..")
     if(NOT VCPKG_BUILD_TYPE)
         file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
         file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config")
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../../..")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "{prefix}/include" "{prefix}/../include")
     endif()
 endif()

diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fltk",
   "version": "1.3.9",
-  "port-version": 1,
+  "port-version": 2,
   "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.",
   "homepage": "https://www.fltk.org/",
   "license": null,

diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
         fix-dependencies.patch
         fix-include-directory.patch
         fix-mingw.patch
+        remove_abs_patch.cmake
 )
 file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}")
 file(TOUCH "${SOURCE_PATH}/src/utf8proc-editable")

diff --git a/ports/mongo-c-driver/remove_abs_patch.cmake b/ports/mongo-c-driver/remove_abs_patch.cmake
@@ -0,0 +1,13 @@
+diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
+index 6e295d68fb..54ab225ba7 100644
+--- a/src/libmongoc/CMakeLists.txt
++++ b/src/libmongoc/CMakeLists.txt
+@@ -474,7 +474,7 @@ if (NOT WIN32)
+    mongoc_get_accept_args (MONGOC_SOCKET_ARG2 MONGOC_SOCKET_ARG3)
+ endif ()
+
+-set (MONGOC_CC ${CMAKE_C_COMPILER})
++cmake_path(GET CMAKE_C_COMPILER FILENAME MONGOC_CC)
+ set (MONGOC_USER_SET_CFLAGS ${CMAKE_C_FLAGS})
+ set (MONGOC_USER_SET_LDFLAGS ${CMAKE_EXE_LINKER_FLAGS})
+
diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mongo-c-driver",
   "version": "1.29.0",
+  "port-version": 1,
   "description": "Client library written in C for MongoDB.",
   "homepage": "https://github.com/mongodb/mongo-c-driver",
   "license": null,

diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake
@@ -49,10 +49,11 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2)
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}")
-
-	file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw")
-	file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw")
+    if(NOT VCPKG_BUILD_TYPE)
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}")
+    endif()
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw")
 endif()
 vcpkg_copy_pdbs()
 

diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "realsense2",
   "version": "2.56.2",
+  "port-version": 1,
   "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).",
   "homepage": "https://github.com/IntelRealSense/librealsense",
   "license": "Apache-2.0",

diff --git a/ports/sese/portfile.cmake b/ports/sese/portfile.cmake
@@ -22,8 +22,8 @@ vcpkg_download_distfile(PATCH_FIX_ENV_STATEMENT
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO libsese/sese
-        REF "refs/tags/${VERSION}"
-        SHA512 a1008c351ea3e8745d629bdcceb4a6d089ae5a84137bbd49b8abbbb271032ddf279e9b20f155181b6a7d3d8cb17c2ec2f1b7a12464fb0cac8402628e473966cb
+        REF "73e1e90be5907e97c27191a72eb22143caabfca1"
+        SHA512 6724bbbce25c718d8ebae4f36deb96fa696d1ee37b9199897224e4789bfeb6fee4288aaf247ec88243a9e63de8906ca748cc1ce7313a0ed4e3104293683337ae
         PATCHES
             ${PATCH_FIX_ENV_STATEMENT}
 )
@@ -51,6 +51,9 @@ vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sese")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+if(VCPKG_BUILD_TYPE)
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+endif()
 
 remove_empty_directories_recursive("${CURRENT_PACKAGES_DIR}/include/sese")
 

diff --git a/ports/sese/vcpkg.json b/ports/sese/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sese",
   "version": "2.3.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A cross-platform framework for basic components.",
   "homepage": "https://github.com/libsese/sese",
   "license": "Apache-2.0",

diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake
@@ -132,7 +132,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endfunction()
 
     # fix dll path for cmake
-    if(NOT VCPKG_BUILD_TYPE))
+    if(NOT VCPKG_BUILD_TYPE)
       file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll")
     endif()
     file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-release.cmake "lib/([a-zA-Z0-9_]+)\\.dll" "bin/\\1.dll")