diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-17 22:08:48 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-01-18 11:03:26 -0800 |
| commit | e44c1b292d194c1949445ac5bc96e1d81f11f4bf (patch) | |
| tree | b942e7d0bcb3bdab65254a4a9cfe6d488ff1c363 | |
| parent | 353d635b97df5c80f270ec200d16a6664c4d6ab6 (diff) | |
| download | vcpkg-e44c1b292d194c1949445ac5bc96e1d81f11f4bf.tar.gz vcpkg-e44c1b292d194c1949445ac5bc96e1d81f11f4bf.zip | |
[boost] Remove version from .lib filenames to improve CMake compatibility. Fixes #2459.
| -rw-r--r-- | ports/boost-build/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-build/Jamroot.jam | 40 | ||||
| -rw-r--r-- | ports/boost-build/boost-modular-build.cmake | 1 |
3 files changed, 22 insertions, 21 deletions
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index 12af51a0f..fb8d36918 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,3 +1,3 @@ Source: boost-build
-Version: 1.66.0-2
+Version: 1.66.0-3
Description: Boost.Build
diff --git a/ports/boost-build/Jamroot.jam b/ports/boost-build/Jamroot.jam index 2762c99ea..3c34905e5 100644 --- a/ports/boost-build/Jamroot.jam +++ b/ports/boost-build/Jamroot.jam @@ -36,8 +36,8 @@ if "@PORT@" != "boost-system" {
use-project /boost/system : . ;
- lib boost_system : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_system-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release ;
- lib boost_system : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_system-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug ;
+ lib boost_system : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_system-vc140-mt.lib <variant>release ;
+ lib boost_system : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_system-vc140-mt-gd.lib <variant>debug ;
explicit boost_system ;
}
@@ -45,8 +45,8 @@ if "@PORT@" != "boost-chrono" {
use-project /boost/chrono : . ;
- lib boost_chrono : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_chrono-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release ;
- lib boost_chrono : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_chrono-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug ;
+ lib boost_chrono : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_chrono-vc140-mt.lib <variant>release ;
+ lib boost_chrono : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_chrono-vc140-mt-gd.lib <variant>debug ;
explicit boost_chrono ;
}
@@ -54,8 +54,8 @@ if "@PORT@" != "boost-regex" {
use-project /boost/regex : . ;
- lib boost_regex : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_regex-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release ;
- lib boost_regex : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_regex-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug ;
+ lib boost_regex : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_regex-vc140-mt.lib <variant>release ;
+ lib boost_regex : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_regex-vc140-mt-gd.lib <variant>debug ;
explicit boost_regex ;
}
@@ -63,8 +63,8 @@ if "@PORT@" != "boost-date-time" {
use-project /boost/date_time : . ;
- lib boost_date_time : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_date_time-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release -<library>/boost/date_time//boost_date_time ;
- lib boost_date_time : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_date_time-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug -<library>/boost/date_time//boost_date_time ;
+ lib boost_date_time : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_date_time-vc140-mt.lib <variant>release -<library>/boost/date_time//boost_date_time ;
+ lib boost_date_time : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_date_time-vc140-mt-gd.lib <variant>debug -<library>/boost/date_time//boost_date_time ;
explicit boost_date_time ;
}
@@ -72,8 +72,8 @@ if "@PORT@" != "boost-thread" {
use-project /boost/thread : . ;
- lib boost_thread : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_thread-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release : : <library>/boost/date_time//boost_date_time ;
- lib boost_thread : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_thread-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug : : <library>/boost/date_time//boost_date_time ;
+ lib boost_thread : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_thread-vc140-mt.lib <variant>release : : <library>/boost/date_time//boost_date_time ;
+ lib boost_thread : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_thread-vc140-mt-gd.lib <variant>debug : : <library>/boost/date_time//boost_date_time ;
explicit boost_thread ;
}
@@ -81,8 +81,8 @@ if "@PORT@" != "boost-timer" {
use-project /boost/timer : . ;
- lib boost_timer : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_timer-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release ;
- lib boost_timer : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_timer-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug ;
+ lib boost_timer : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_timer-vc140-mt.lib <variant>release ;
+ lib boost_timer : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_timer-vc140-mt-gd.lib <variant>debug ;
explicit boost_timer ;
}
@@ -90,8 +90,8 @@ if "@PORT@" != "boost-filesystem" {
use-project /boost/filesystem : . ;
- lib boost_filesystem : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_filesystem-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release : : <library>/boost/system//boost_system ;
- lib boost_filesystem : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_filesystem-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug : : <library>/boost/system//boost_system ;
+ lib boost_filesystem : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_filesystem-vc140-mt.lib <variant>release : : <library>/boost/system//boost_system ;
+ lib boost_filesystem : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_filesystem-vc140-mt-gd.lib <variant>debug : : <library>/boost/system//boost_system ;
explicit boost_filesystem ;
}
@@ -99,8 +99,8 @@ if "@PORT@" != "boost-atomic" {
use-project /boost/atomic : . ;
- lib boost_atomic : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_atomic-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release ;
- lib boost_atomic : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_atomic-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug ;
+ lib boost_atomic : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_atomic-vc140-mt.lib <variant>release ;
+ lib boost_atomic : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_atomic-vc140-mt-gd.lib <variant>debug ;
explicit boost_atomic ;
}
@@ -111,8 +111,8 @@ if "@PORT@" != "boost-context" use-project /boost/context : . ;
- lib boost_context : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_context-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release ;
- lib boost_context : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_context-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug ;
+ lib boost_context : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_context-vc140-mt.lib <variant>release ;
+ lib boost_context : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_context-vc140-mt-gd.lib <variant>debug ;
explicit boost_context ;
}
@@ -120,8 +120,8 @@ if "@PORT@" != "boost-test" {
use-project /boost/test : . ;
- lib boost_unit_test_framework : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_unit_test_framework-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib <variant>release ;
- lib boost_unit_test_framework : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_unit_test_framework-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib <variant>debug ;
+ lib boost_unit_test_framework : : <file>@CURRENT_INSTALLED_DIR@/lib/boost_unit_test_framework-vc140-mt.lib <variant>release ;
+ lib boost_unit_test_framework : : <file>@CURRENT_INSTALLED_DIR@/debug/lib/boost_unit_test_framework-vc140-mt-gd.lib <variant>debug ;
explicit boost_unit_test_framework ;
}
diff --git a/ports/boost-build/boost-modular-build.cmake b/ports/boost-build/boost-modular-build.cmake index f0d43f1b3..a67dde31c 100644 --- a/ports/boost-build/boost-modular-build.cmake +++ b/ports/boost-build/boost-modular-build.cmake @@ -260,6 +260,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
+ string(REPLACE "-1_66" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
string(REPLACE "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME})
if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
# nothing to do
|