3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-30 20:59:12 +08:00
Code Issues Projects Releases Wiki Activity

[boost] Hotfix for building on VS2015

Browse Source
This commit is contained in:
Robert Schumacher 2017-03-02 02:56:35 -08:00
parent 4139b912fc
commit b11ab655e2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/boost/CONTROL
View File

@ -1,4 +1,4 @@
Source: boost Source: boost
Version: 1.63-1 Version: 1.63-2
Description: Peer-reviewed portable C++ source libraries Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib, bzip2 Build-Depends: zlib, bzip2

4
ports/boost/portfile.cmake
View File

@ -163,7 +163,9 @@ function(boost_rename_libs LIBS)
string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries
string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
if (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) if ("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
# nothing to do
elseif (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}) file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME})
else() else()
file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})