diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-05-22 22:04:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-22 22:04:16 -0700 |
| commit | 6f1ac121e646d1116744bc967f25fe33b765aeaf (patch) | |
| tree | 5907e60fca9f3956edf147a5c472a4a0baabd63f | |
| parent | c1dfb6e68117880655247c5d4694f78ef8aabea0 (diff) | |
| parent | b91e8ad2796bb791ff8870b86a87f4b033cbe5e1 (diff) | |
| download | vcpkg-6f1ac121e646d1116744bc967f25fe33b765aeaf.tar.gz vcpkg-6f1ac121e646d1116744bc967f25fe33b765aeaf.zip | |
Merge pull request #6529 from lebdron/boost-dynamic
[boost-modular-build-helper] Dynamic build support
| -rw-r--r-- | ports/boost-modular-build-helper/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 12 |
3 files changed, 15 insertions, 4 deletions
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index df109c57e..cd5f46115 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -158,9 +158,12 @@ add_custom_target(boost ALL threading=multi
threadapi=pthread
debug-symbols=on
+
+ stage
WORKING_DIRECTORY ${SOURCE_PATH}/build
)
+set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/stage/lib)
install(
- CODE "file(GLOB LIBS ${CMAKE_CURRENT_BINARY_DIR}/boost/build/*/*.a)\nif(LIBS)\nfile(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\")\nendif()"
+ CODE "file(GLOB LIBS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.*)\nif(LIBS)\nfile(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\")\nendif()"
)
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 51347569e..c72ccb307 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,2 +1,2 @@ Source: boost-modular-build-helper
-Version: 1.70.0-1
+Version: 1.70.0-2
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 308212384..93e4b457f 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -40,8 +40,16 @@ function(boost_modular_build) set(BOOST_LIB_DEBUG_SUFFIX -vc140-mt-gd.lib)
else()
set(BOOST_LIB_PREFIX lib)
- set(BOOST_LIB_RELEASE_SUFFIX .a)
- set(BOOST_LIB_DEBUG_SUFFIX .a)
+ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ set(BOOST_LIB_RELEASE_SUFFIX .a)
+ set(BOOST_LIB_DEBUG_SUFFIX .a)
+ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ set(BOOST_LIB_RELEASE_SUFFIX .dylib)
+ set(BOOST_LIB_DEBUG_SUFFIX .dylib)
+ else()
+ set(BOOST_LIB_RELEASE_SUFFIX .so)
+ set(BOOST_LIB_DEBUG_SUFFIX .so)
+ endif()
endif()
if(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile.v2")
|