diff options
| author | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
|---|---|---|
| committer | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
| commit | 54409423f767d8b1cf30cb7d0efca6b4ca138823 (patch) | |
| tree | d915ac7828703ce4b963efdd9728a1777ba18c1e /vcpkg/ports/fmilib/devendor-sublibs.diff | |
Diffstat (limited to 'vcpkg/ports/fmilib/devendor-sublibs.diff')
| -rw-r--r-- | vcpkg/ports/fmilib/devendor-sublibs.diff | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/vcpkg/ports/fmilib/devendor-sublibs.diff b/vcpkg/ports/fmilib/devendor-sublibs.diff new file mode 100644 index 0000000..8845c35 --- /dev/null +++ b/vcpkg/ports/fmilib/devendor-sublibs.diff @@ -0,0 +1,54 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 690ee5f..2816987 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -230,7 +230,7 @@ configure_file ( + "${FMILibrary_BINARY_DIR}/fmilib_config.h" + ) + +-set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} expat minizip zlib c99snprintf) ++set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} minizip c99snprintf) + set(FMILIB_SUBLIBS ${FMIIMPORT_LIBRARIES} ${JMUTIL_LIBRARIES} ${FMILIB_SHARED_SUBLIBS}) + set(FMILIB_SHARED_SRC ${FMIIMPORTSOURCE} ${JMUTILSOURCE} ${FMIIMPORTHEADERS}) + +diff --git a/Config.cmake/fmixml.cmake b/Config.cmake/fmixml.cmake +index ddd3c1f..3bafac3 100644 +--- a/Config.cmake/fmixml.cmake ++++ b/Config.cmake/fmixml.cmake +@@ -137,6 +137,7 @@ set(FMIXMLSOURCE + src/FMI2/fmi2_xml_variable.c + ) + ++if(0) + include(ExternalProject) + + # The *_POSTFIX variables are set because it makes it easier to determine the name of +@@ -211,7 +212,10 @@ if(FMILIB_INSTALL_SUBLIBS) + DESTINATION lib) + endif() + ++endif(0) + set(EXPAT_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ExpatEx/install/include) ++find_package(expat CONFIG REQUIRED) ++add_library(expat ALIAS expat::expat) + + include_directories("${EXPAT_INCLUDE_DIRS}" "${FMILIB_THIRDPARTYLIBS}/FMI/" "${FMIXMLGENDIR}/FMI1" "${FMIXMLGENDIR}/FMI2") + +diff --git a/Config.cmake/fmizip.cmake b/Config.cmake/fmizip.cmake +index c046d47..50e82b3 100644 +--- a/Config.cmake/fmizip.cmake ++++ b/Config.cmake/fmizip.cmake +@@ -20,7 +20,12 @@ if(NOT FMIZIPDIR) + + set(FMIZIP_LIBRARIES fmizip) + +- add_subdirectory(Config.cmake/Minizip) ++ add_library(minizip OBJECT ++ "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/miniunz.c" ++ "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/minizip.c" ++ ) ++ find_package(unofficial-minizip CONFIG REQUIRED) ++ target_link_libraries(minizip PRIVATE unofficial::minizip::minizip) + + include_directories("${FMIZIPDIR}/include" "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip" "${FMILIB_THIRDPARTYLIBS}/FMI" "${FMILIB_THIRDPARTYLIBS}/Zlib/zlib-1.2.6" "${FMILibrary_BINARY_DIR}/zlib") + |