diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index d4022d721e..f9362db458 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES libconfig++-cmake-export.diff + static-build.diff ) vcpkg_cmake_configure( diff --git a/ports/libconfig/static-build.diff b/ports/libconfig/static-build.diff new file mode 100644 index 0000000000..1b1a0f420c --- /dev/null +++ b/ports/libconfig/static-build.diff @@ -0,0 +1,34 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 233c89f..8164b41 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -25,7 +25,6 @@ set(libinc_cpp + libconfig.hh) + + set(libsrc_cpp +- ${libsrc} + libconfigcpp.cc) + + if(MSVC) +@@ -55,8 +54,10 @@ set_target_properties(${libname}++ + #check_symbol_exists(freelocale "locale.h" HAVE_FREELOCALE) + + if(BUILD_SHARED_LIBS) ++ target_sources(${libname}++ PRIVATE ${libsrc}) + target_compile_definitions(${libname}++ PRIVATE LIBCONFIG_STATIC) + else() ++ target_link_libraries(${libname}++ PRIVATE ${libname}) + target_compile_definitions(${libname} PUBLIC LIBCONFIG_STATIC) + target_compile_definitions(${libname}++ PUBLIC LIBCONFIGXX_STATIC) + endif() +@@ -91,8 +92,8 @@ if(MSVC) + endif() + + if(WIN32) +- target_link_libraries(${libname} shlwapi) +- target_link_libraries(${libname}++ shlwapi) ++ target_link_libraries(${libname} PRIVATE shlwapi) ++ target_link_libraries(${libname}++ PRIVATE shlwapi) + endif() + + target_include_directories(${libname} diff --git a/ports/libconfig/vcpkg.json b/ports/libconfig/vcpkg.json index 794e91f464..fba3d05e5d 100644 --- a/ports/libconfig/vcpkg.json +++ b/ports/libconfig/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libconfig", "version": "1.7.3", - "port-version": 4, + "port-version": 5, "description": "C/C++ library for processing configuration files", "homepage": "https://github.com/hyperrealm/libconfig", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0aaee08bb9..aa67dd70c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4130,7 +4130,7 @@ }, "libconfig": { "baseline": "1.7.3", - "port-version": 4 + "port-version": 5 }, "libconfuse": { "baseline": "2019-07-14", diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 38ee00e469..c140962e03 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb011bd374885434cf90d445526e42aca185c1e7", + "version": "1.7.3", + "port-version": 5 + }, { "git-tree": "378d40ce036cf220dfaedf27f625a28d6e72d3e9", "version": "1.7.3",