aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-11-15 14:52:52 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2016-11-15 14:52:52 -0800
commit7811ef602ecd963ae333e3427c82629d1c8e9f34 (patch)
tree5204dca97387b06fcc622a3433c71f84426e1cd8
parent727e4ed6faabead764c4dbffaa5b57f5cfb4017a (diff)
downloadvcpkg-7811ef602ecd963ae333e3427c82629d1c8e9f34.tar.gz
vcpkg-7811ef602ecd963ae333e3427c82629d1c8e9f34.zip
[boost] Rename lib files in static builds
-rw-r--r--ports/boost/CONTROL2
-rw-r--r--ports/boost/portfile.cmake32
2 files changed, 17 insertions, 17 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 5d074197e..c96b8cf35 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,3 +1,3 @@
Source: boost
-Version: 1.62-3
+Version: 1.62-4
Description: Peer-reviewed portable C++ source libraries
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 5f9b29c32..7394e70ea 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -110,14 +110,14 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
FILES_MATCHING PATTERN "*.dll")
else()
- # file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/libboost*.lib)
- # foreach(LIB ${RELEASE_LIBS})
- # get_filename_component(OLD_FILENAME ${LIB} NAME)
- # get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
- # string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
- # string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME})
- # file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
- # endforeach()
+ file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/libboost*.lib)
+ foreach(LIB ${RELEASE_LIBS})
+ get_filename_component(OLD_FILENAME ${LIB} NAME)
+ get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
+ string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
+ string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME})
+ file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
+ endforeach()
endif()
message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
@@ -130,14 +130,14 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
FILES_MATCHING PATTERN "*.dll")
else()
- # file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/libboost*.lib)
- # foreach(LIB ${DEBUG_LIBS})
- # get_filename_component(OLD_FILENAME ${LIB} NAME)
- # get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
- # string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
- # string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME})
- # file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
- # endforeach()
+ file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/libboost*.lib)
+ foreach(LIB ${DEBUG_LIBS})
+ get_filename_component(OLD_FILENAME ${LIB} NAME)
+ get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
+ string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
+ string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME})
+ file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
+ endforeach()
endif()
message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")