3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 03:27:58 +08:00
Code Issues Projects Releases Wiki Activity

[boost] Remove version from .lib filenames to improve CMake compatibility. Fixes #2459.

Browse Source
This commit is contained in:
Robert Schumacher 2018-01-17 22:08:48 -08:00
parent 353d635b97
commit e44c1b292d
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/boost-build/CONTROL
View File

@ -1,3 +1,3 @@
Source: boost-build Source: boost-build
Version: 1.66.0-2 Version: 1.66.0-3
Description: Boost.Build Description: Boost.Build

40
ports/boost-build/Jamroot.jam
View File

@ -36,8 +36,8 @@ if "@PORT@" != "boost-system"
{ {
use-project /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@/lib/boost_system-vc140-mt.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@/debug/lib/boost_system-vc140-mt-gd.lib <variant>debug ;
explicit boost_system ; explicit boost_system ;
} }
@ -45,8 +45,8 @@ if "@PORT@" != "boost-chrono"
{ {
use-project /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@/lib/boost_chrono-vc140-mt.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@/debug/lib/boost_chrono-vc140-mt-gd.lib <variant>debug ;
explicit boost_chrono ; explicit boost_chrono ;
} }
@ -54,8 +54,8 @@ if "@PORT@" != "boost-regex"
{ {
use-project /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@/lib/boost_regex-vc140-mt.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@/debug/lib/boost_regex-vc140-mt-gd.lib <variant>debug ;
explicit boost_regex ; explicit boost_regex ;
} }
@ -63,8 +63,8 @@ if "@PORT@" != "boost-date-time"
{ {
use-project /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@/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-$(BOOST_VERSION_ABI_TAG).lib <variant>debug -<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 ; explicit boost_date_time ;
} }
@ -72,8 +72,8 @@ if "@PORT@" != "boost-thread"
{ {
use-project /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@/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-$(BOOST_VERSION_ABI_TAG).lib <variant>debug : : <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 ; explicit boost_thread ;
} }
@ -81,8 +81,8 @@ if "@PORT@" != "boost-timer"
{ {
use-project /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@/lib/boost_timer-vc140-mt.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@/debug/lib/boost_timer-vc140-mt-gd.lib <variant>debug ;
explicit boost_timer ; explicit boost_timer ;
} }
@ -90,8 +90,8 @@ if "@PORT@" != "boost-filesystem"
{ {
use-project /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@/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-$(BOOST_VERSION_ABI_TAG).lib <variant>debug : : <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 ; explicit boost_filesystem ;
} }
@ -99,8 +99,8 @@ if "@PORT@" != "boost-atomic"
{ {
use-project /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@/lib/boost_atomic-vc140-mt.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@/debug/lib/boost_atomic-vc140-mt-gd.lib <variant>debug ;
explicit boost_atomic ; explicit boost_atomic ;
} }
@ -111,8 +111,8 @@ if "@PORT@" != "boost-context"
use-project /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@/lib/boost_context-vc140-mt.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@/debug/lib/boost_context-vc140-mt-gd.lib <variant>debug ;
explicit boost_context ; explicit boost_context ;
} }
@ -120,8 +120,8 @@ if "@PORT@" != "boost-test"
{ {
use-project /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@/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-$(BOOST_VERSION_ABI_TAG).lib <variant>debug ; 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 ; explicit boost_unit_test_framework ;
} }

1
ports/boost-build/boost-modular-build.cmake
View File

@ -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 "-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 "-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 "-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}) string(REPLACE "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME})
if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
# nothing to do # nothing to do