diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-02 02:56:35 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-02 02:56:35 -0800 |
| commit | b11ab655e2543faec126b8a813ff5dc171958cad (patch) | |
| tree | 835ed5f7913e504000fda02ce067e0d1dd2ec19b | |
| parent | 4139b912fca88aa83d562a6777d60fb5a8ba5fc1 (diff) | |
| download | vcpkg-b11ab655e2543faec126b8a813ff5dc171958cad.tar.gz vcpkg-b11ab655e2543faec126b8a813ff5dc171958cad.zip | |
[boost] Hotfix for building on VS2015
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index ca9ae9ac1..3f1127ab0 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost -Version: 1.63-1 +Version: 1.63-2 Description: Peer-reviewed portable C++ source libraries Build-Depends: zlib, bzip2 diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index c4183d318..343e0c5b0 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -163,7 +163,9 @@ function(boost_rename_libs 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 "-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}) else() file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) |