diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-25 15:25:18 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-25 15:25:18 -0800 |
| commit | 5335d17f53d491d83d98e80ab0e750ec0f6f430b (patch) | |
| tree | f1d366671aa5fe7e1a10c6f0b93b52ff72f49666 /ports | |
| parent | 6b64a9adb606ad442e71ba562efd17d42baee3a0 (diff) | |
| download | vcpkg-5335d17f53d491d83d98e80ab0e750ec0f6f430b.tar.gz vcpkg-5335d17f53d491d83d98e80ab0e750ec0f6f430b.zip | |
[vcpkg] Initial experimental support for VCPKG_BUILD_TYPE release
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/boost/portfile.cmake | 104 |
1 files changed, 56 insertions, 48 deletions
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index fa264fa51..5d7eee0b3 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -223,33 +223,37 @@ set(B2_OPTIONS_REL ###################### # Perform build + Package ###################### -message(STATUS "Building ${TARGET_TRIPLET}-rel") -set(ENV{BOOST_BUILD_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) -vcpkg_execute_required_process_repeat( - COUNT 2 - COMMAND "${SOURCE_PATH}/b2.exe" - --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage - --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - ${B2_OPTIONS_REL} - variant=release - debug-symbols=on - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-rel -) -message(STATUS "Building ${TARGET_TRIPLET}-rel done") -message(STATUS "Building ${TARGET_TRIPLET}-dbg") -set(ENV{BOOST_BUILD_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) -vcpkg_execute_required_process_repeat( - COUNT 2 - COMMAND "${SOURCE_PATH}/b2.exe" - --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage - --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - ${B2_OPTIONS_DBG} - variant=debug - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-dbg -) -message(STATUS "Building ${TARGET_TRIPLET}-dbg done") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Building ${TARGET_TRIPLET}-rel") + set(ENV{BOOST_BUILD_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + vcpkg_execute_required_process_repeat( + COUNT 2 + COMMAND "${SOURCE_PATH}/b2.exe" + --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage + --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + ${B2_OPTIONS_REL} + variant=release + debug-symbols=on + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-rel + ) + message(STATUS "Building ${TARGET_TRIPLET}-rel done") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + set(ENV{BOOST_BUILD_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + vcpkg_execute_required_process_repeat( + COUNT 2 + COMMAND "${SOURCE_PATH}/b2.exe" + --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage + --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + ${B2_OPTIONS_DBG} + variant=debug + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-dbg + ) + message(STATUS "Building ${TARGET_TRIPLET}-dbg done") +endif() message(STATUS "Packaging headers") file( @@ -294,32 +298,36 @@ function(boost_rename_libs LIBS) endforeach() endfunction() -message(STATUS "Packaging ${TARGET_TRIPLET}-rel") -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/ - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - FILES_MATCHING PATTERN "*.lib") -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Packaging ${TARGET_TRIPLET}-rel") file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/ - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - FILES_MATCHING PATTERN "*.dll") -endif() -file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/*.lib) + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + FILES_MATCHING PATTERN "*.lib") + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/ + DESTINATION ${CURRENT_PACKAGES_DIR}/bin + FILES_MATCHING PATTERN "*.dll") + endif() + file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/*.lib) -boost_rename_libs(RELEASE_LIBS) -message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") + boost_rename_libs(RELEASE_LIBS) + message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") +endif() -message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/ - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - FILES_MATCHING PATTERN "*.lib") -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/ - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - FILES_MATCHING PATTERN "*.dll") + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + FILES_MATCHING PATTERN "*.lib") + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/ + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + FILES_MATCHING PATTERN "*.dll") + endif() + file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib) + boost_rename_libs(DEBUG_LIBS) + message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done") endif() -file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib) -boost_rename_libs(DEBUG_LIBS) -message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done") macro(move_to_manual_link LIBNAME) if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/${LIBNAME}-vc140-mt-${VERSION_FULL}.lib) |
