diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-30 01:51:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-30 01:51:21 -0800 |
| commit | ecaafb9b82252faea6b836ae5b15a8ade2fa2c79 (patch) | |
| tree | 95039a929d0e52f17549015d86153c0a0ce3f810 | |
| parent | fb0c2bb928631b44e4776a1dd35b28f302ced166 (diff) | |
| parent | 75745ed90d8804cc659f75f51cc365efdcb6f773 (diff) | |
| download | vcpkg-ecaafb9b82252faea6b836ae5b15a8ade2fa2c79.tar.gz vcpkg-ecaafb9b82252faea6b836ae5b15a8ade2fa2c79.zip | |
Merge pull request #2672 from UnaNancyOwen/fix_boost
[boost-test] Fix for VCPKG_BUILD_TYPE
| -rw-r--r-- | ports/boost-test/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-test/portfile.cmake | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL index 63b982ee4..52dac99e2 100644 --- a/ports/boost-test/CONTROL +++ b/ports/boost-test/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-test
-Version: 1.66.0-1
+Version: 1.66.0-2
Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-range, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
Description: Boost test module
diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 57d6b99d0..acb28c7d4 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -14,12 +14,17 @@ include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
-file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*)
-file(COPY ${MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
-file(GLOB DEBUG_MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*)
-file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+ file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*)
+ file(COPY ${MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+ file(REMOVE ${MONITOR_LIBS})
+endif()
-file(REMOVE ${DEBUG_MONITOR_LIBS} ${MONITOR_LIBS})
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+ file(GLOB DEBUG_MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*)
+ file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+ file(REMOVE ${DEBUG_MONITOR_LIBS})
+endif()
|