mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:52:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[meson] fix single-config builds (#15937)

Browse Source
This commit is contained in:
Stefano Sinigardi 2021-02-02 04:27:34 +01:00 committed by GitHub
parent bc28e2f577
commit d97ce7dfc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/cmake/vcpkg_install_meson.cmake
View File

@ -30,19 +30,23 @@ function(vcpkg_install_meson)
set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}")
endif() endif()
message(STATUS "Package ${TARGET_TRIPLET}-rel") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
vcpkg_execute_required_process( message(STATUS "Package ${TARGET_TRIPLET}-rel")
COMMAND ${NINJA} install -v vcpkg_execute_required_process(
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel COMMAND ${NINJA} install -v
LOGNAME package-${TARGET_TRIPLET}-rel WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
) LOGNAME package-${TARGET_TRIPLET}-rel
)
endif()
message(STATUS "Package ${TARGET_TRIPLET}-dbg") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
vcpkg_execute_required_process( message(STATUS "Package ${TARGET_TRIPLET}-dbg")
COMMAND ${NINJA} install -v vcpkg_execute_required_process(
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg COMMAND ${NINJA} install -v
LOGNAME package-${TARGET_TRIPLET}-dbg WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
) LOGNAME package-${TARGET_TRIPLET}-dbg
)
endif()
set(RENAMED_LIBS) set(RENAMED_LIBS)
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) 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 ".a$" ".lib" LIBNAMENEW "${LIBNAME}")
string(REGEX REPLACE "^lib" "" LIBNAMENEW "${LIBNAMENEW}") string(REGEX REPLACE "^lib" "" LIBNAMENEW "${LIBNAMENEW}")
file(RENAME "${_library}" "${LIBDIR}/${LIBNAMENEW}") file(RENAME "${_library}" "${LIBDIR}/${LIBNAMENEW}")
# For cmake fixes. # For cmake fixes.
string(REGEX REPLACE ".a$" "" LIBRAWNAMEOLD "${LIBNAME}") string(REGEX REPLACE ".a$" "" LIBRAWNAMEOLD "${LIBNAME}")
string(REGEX REPLACE ".lib$" "" LIBRAWNAMENEW "${LIBNAMENEW}") string(REGEX REPLACE ".lib$" "" LIBRAWNAMENEW "${LIBNAMENEW}")
list(APPEND RENAMED_LIBS ${LIBRAWNAMENEW}) list(APPEND RENAMED_LIBS ${LIBRAWNAMENEW})