start fixin libraries

microsoft · BillyONeal · Apr 29, 2022 · Apr 12, 2022 · Apr 13, 2022 · Apr 14, 2022
commit 0f9c6a60377a01972292e6015eeef57f13ac6639
diff --git a/ports/ampl-mp/fix-arm-build.patch b/ports/ampl-mp/fix-arm-build.patch
@@ -2,6 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 92089a3..d4c6762 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
+@@ -240,4 +240,4 @@
+ set(MP_EXPR_INFO_FILE ${MP_SOURCE_DIR}/src/expr-info.cc)
+-add_executable(gen-expr-info EXCLUDE_FROM_ALL
++add_executable(gen-expr-info
+   src/gen-expr-info.cc $<TARGET_OBJECTS:format>)
+ if (MINGW)
 @@ -257,9 +257,15 @@ if (CMAKE_CROSSCOMPILING)
      COMMAND ${CMAKE_COMMAND} -E echo
        "warning: cannot re-generate ${MP_EXPR_INFO_FILE}")

diff --git a/ports/ampl-mp/vcpkg.json b/ports/ampl-mp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ampl-mp",
   "version-string": "2020-11-11",
-  "port-version": 2,
+  "port-version": 3,
   "description": "An open-source library for mathematical programming",
   "homepage": "https://github.com/ampl/mp",
   "supports": "!uwp",

diff --git a/ports/caf/fix_cxx17.patch b/ports/caf/fix_cxx17.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ a/CMakeLists.txt
+@@ -115,3 +115,4 @@
++target_compile_features(caf_internal INTERFACE cxx_std_17)
+ # TODO: simply set CXX_STANDARD when switching to CMake ≥ 3.9.6
+-if(NOT CMAKE_CROSSCOMPILING)
++if(0)
+   try_compile(caf_has_cxx_17
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix_dependency.patch
+        fix_cxx17.patch
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "caf",
   "version": "0.18.5",
+  "port-version": 1,
   "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.",
   "homepage": "https://github.com/actor-framework/actor-framework",
   "dependencies": [

diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake
@@ -24,11 +24,19 @@ endforeach()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
 
+set(corrade_rc_param "")
+if(VCPKG_CROSSCOMPILING)
+    set(corrade_rc_param
+        "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+    )
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH "${SOURCE_PATH}"
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
         ${FEATURE_OPTIONS}
+        ${corrade_rc_param}
         -DUTILITY_USE_ANSI_COLORS=ON
         -DBUILD_STATIC=${BUILD_STATIC}
 )
@@ -40,7 +48,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Install tools
-if("utility" IN_LIST FEATURES)
+if("utility" IN_LIST FEATURES AND NOT VCPKG_CROSSCOMPILING)
     # Drop a copy of tools
     vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN)
 endif()
@@ -67,4 +75,4 @@ file(INSTALL "${SOURCE_PATH}/COPYING"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
     RENAME copyright)
 
-vcpkg_copy_pdbs()
+vcpkg_copy_pdbs()
diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json
@@ -1,9 +1,17 @@
 {
   "name": "corrade",
   "version-string": "2020.06",
-  "port-version": 3,
+  "port-version": 4,
   "description": "C++11/C++14 multiplatform utility library.",
   "homepage": "https://magnum.graphics/corrade/",
+  "dependencies": [
+    {
+      "name": "corrade",
+      "host": true,
+      "default-features": false,
+      "features": [ "utility" ]
+    }
+  ],
   "default-features": [
     "interconnect",
     "pluginmanager",

diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake
@@ -19,6 +19,11 @@ else()
     set(OPTION_USE_GL "-DOPTION_USE_GL=ON")
 endif()
 
+set(fluid_path_param "")
+if(VCPKG_CROSSCOMPILING)
+    set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -30,6 +35,7 @@ vcpkg_cmake_configure(
         -DOPTION_USE_SYSTEM_LIBJPEG=ON
         -DOPTION_BUILD_SHARED_LIBS=OFF
         -DFLTK_CONFIG_PATH=share/fltk
+        ${fluid_path_param}
         ${OPTION_USE_GL}
 )
 
@@ -39,7 +45,12 @@ vcpkg_cmake_config_fixup()
 
 vcpkg_copy_pdbs()
 
-if(VCPKG_TARGET_IS_OSX)
+# don't install fluid
+if(VCPKG_CROSSCOMPILING)
+    if(NOT VCPKG_TARGET_IS_WINDOWS)
+        vcpkg_copy_tools(TOOL_NAMES fltk-config AUTO_CLEAN)
+    endif()
+elseif(VCPKG_TARGET_IS_OSX)
     vcpkg_copy_tools(TOOL_NAMES fluid.app fltk-config AUTO_CLEAN)
 elseif(VCPKG_TARGET_IS_WINDOWS)
     file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config")

diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "fltk",
   "version": "1.3.8",
-  "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/",
   "supports": "!uwp",
   "dependencies": [
+    {
+      "name": "fltk",
+      "host": true
+    },
     "libjpeg-turbo",
     "libpng",
     {