diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-02-02 04:27:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 19:27:34 -0800 |
| commit | d97ce7dfc24939519c93978524766967fb5d95aa (patch) | |
| tree | 42cc18d76fb64d9de6520329970851b27fcbd595 /scripts | |
| parent | bc28e2f57791b5aa6227b154fe4016a1f5b7cd67 (diff) | |
| download | vcpkg-d97ce7dfc24939519c93978524766967fb5d95aa.tar.gz vcpkg-d97ce7dfc24939519c93978524766967fb5d95aa.zip | |
[meson] fix single-config builds (#15937)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_install_meson.cmake | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index 216202918..18cd03e6c 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -30,19 +30,23 @@ function(vcpkg_install_meson) set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") endif() - message(STATUS "Package ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND ${NINJA} install -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME package-${TARGET_TRIPLET}-rel - ) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Package ${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND ${NINJA} install -v + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + LOGNAME package-${TARGET_TRIPLET}-rel + ) + endif() - message(STATUS "Package ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND ${NINJA} install -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME package-${TARGET_TRIPLET}-dbg - ) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Package ${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND ${NINJA} install -v + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + LOGNAME package-${TARGET_TRIPLET}-dbg + ) + endif() set(RENAMED_LIBS) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -54,7 +58,7 @@ function(vcpkg_install_meson) string(REGEX REPLACE ".a$" ".lib" LIBNAMENEW "${LIBNAME}") string(REGEX REPLACE "^lib" "" LIBNAMENEW "${LIBNAMENEW}") file(RENAME "${_library}" "${LIBDIR}/${LIBNAMENEW}") - # For cmake fixes. + # For cmake fixes. string(REGEX REPLACE ".a$" "" LIBRAWNAMEOLD "${LIBNAME}") string(REGEX REPLACE ".lib$" "" LIBRAWNAMENEW "${LIBNAMENEW}") list(APPEND RENAMED_LIBS ${LIBRAWNAMENEW}) |