Skip to content

Commit

Permalink
[boost] Remove version from .lib filenames to improve CMake compatibi…
Browse files Browse the repository at this point in the history 
…lity. Fixes #2459.
  • Loading branch information
@ras0219-msft
ras0219-msft committed Jan 18, 2018
1 parent 353d635 commit e44c1b2
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion ports/boost-build/CONTROL
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: boost-build
Version: 1.66.0-2
Version: 1.66.0-3
Description: Boost.Build
40 changes: 20 additions & 20 deletions ports/boost-build/Jamroot.jam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,71 +36,71 @@ 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 ;
}

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 ;
}

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 ;
}

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 ;
}

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 ;
}

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 ;
}

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 ;
}

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 ;
}

Expand All @@ -111,17 +111,17 @@ 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 ;
}

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 ;
}

Expand Down
1 change: 1 addition & 0 deletions ports/boost-build/boost-modular-build.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e44c1b2

Please sign in to comment.