diff options
| author |  Sadie Powell | 2025-04-17 17:15:33 +0100 |
|---|---|---|
| committer | Sadie Powell | 2025-04-18 11:58:43 +0100 |
| commit | 87c3583bb2747bccab8227381a79c573ac78396e (patch) | |
| tree | aa455ab9063b20498d7f86d92ba191d0f999a15c | |
| parent | Fix enforcing use of the PSL database in link data. (diff) | |
Tweak the Windows package build options.
[skip alpine ci]
[skip irctest ci]
[skip macos ci]
[skip ubuntu ci]
| -rw-r--r-- | win/conanfile.txt | 17 | ||||
| -rw-r--r-- | win/modules/CMakeLists.txt | 5 |
2 files changed, 12 insertions, 10 deletions
diff --git a/win/conanfile.txt b/win/conanfile.txt index 9ee7098ef..077327f12 100644 --- a/win/conanfile.txt +++ b/win/conanfile.txt @@ -17,16 +17,13 @@ sqlite3/3.49.1 yyjson/0.10.0 [options] -argon2/*:shared=True -libmaxminddb/*:shared=True -libmysqlclient/*:shared=True -libpq/*:shared=True -libpsl/*:shared=True -openssl/*:shared=True -pcre2/*:shared=True -re2/*:shared=True -sqlite3/*:shared=True -yyjson/*:shared=True +*/*:shared=True +libmaxminddb/*:with_binaries=False +openssl/*:no_apps=True +pcre2/*:build_pcre2_16=False +pcre2/*:build_pcre2_32=False +pcre2/*:build_pcre2grep=False +sqlite3/*:build_executable=False [generators] CMakeDeps diff --git a/win/modules/CMakeLists.txt b/win/modules/CMakeLists.txt index 16aa6b09f..0b7fb62c9 100644 --- a/win/modules/CMakeLists.txt +++ b/win/modules/CMakeLists.txt @@ -64,6 +64,11 @@ if(DEFINED CMAKE_TOOLCHAIN_FILE) file(GLOB EXTRA_DLLS "${CMAKE_BINARY_DIR}/extradll/*.dll") install(FILES ${EXTRA_DLLS} DESTINATION .) + + foreach(EXTRA_DLL ${EXTRA_DLLS}) + cmake_path(GET EXTRA_DLL FILENAME EXTRA_DLL_FILE) + message("Installing dependency DLL: ${EXTRA_DLL_FILE}") + endforeach() else() message("Unable to build extras: CMAKE_TOOLCHAIN_FILE is not set to the Conan toolchain!") endif() |