aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2020-07-16 05:44:01 +0800
committerGitHub <noreply@github.com>2020-07-15 14:44:01 -0700
commit9668eea2b4071da286e503c95b9f6b48e8d938eb (patch)
tree475032ed692e8e3e5631af5f811c932b57146992
parent075a18b594d6ce45772bb056c1bd60732a0ebd4b (diff)
downloadvcpkg-9668eea2b4071da286e503c95b9f6b48e8d938eb.tar.gz
vcpkg-9668eea2b4071da286e503c95b9f6b48e8d938eb.zip
[boost-modular-build-helper] Remove has_icu.lib (#12417)
* [boost-modular-build-helper] Remove has_icu.lib * Add quotes
-rw-r--r--ports/boost-modular-build-helper/CONTROL3
-rw-r--r--ports/boost-modular-build-helper/boost-modular-build.cmake8
2 files changed, 10 insertions, 1 deletions
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index 79cc74ccd..29c1d24c8 100644
--- a/ports/boost-modular-build-helper/CONTROL
+++ b/ports/boost-modular-build-helper/CONTROL
@@ -1,2 +1,3 @@
Source: boost-modular-build-helper
-Version: 1.73.0-1
+Version: 1.73.0
+Port-Version: 2
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index a70363ee4..1ce6ad1cc 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -386,5 +386,13 @@ function(boost_modular_build)
endif()
endforeach()
+ # boost-regex[icu] and boost-locale[icu] generate has_icu.lib
+ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/has_icu.lib")
+ file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/has_icu.lib")
+ endif()
+ if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/has_icu.lib")
+ file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/has_icu.lib")
+ endif()
+
vcpkg_copy_pdbs()
endfunction()