mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-23 19:17:10 +01:00
jom the install, dynamic linkage means tools need the dlls
This commit is contained in:
parent
095afa2ff1
commit
9467c1bd81
@ -58,7 +58,7 @@ message(STATUS "Build ${TARGET_TRIPLET} done")
|
|||||||
|
|
||||||
message(STATUS "Installing ${TARGET_TRIPLET}")
|
message(STATUS "Installing ${TARGET_TRIPLET}")
|
||||||
vcpkg_execute_required_process(
|
vcpkg_execute_required_process(
|
||||||
COMMAND ${NMAKE} install
|
COMMAND ${JOM} install
|
||||||
WORKING_DIRECTORY ${OUTPUT_PATH}
|
WORKING_DIRECTORY ${OUTPUT_PATH}
|
||||||
LOGNAME install-${TARGET_TRIPLET}
|
LOGNAME install-${TARGET_TRIPLET}
|
||||||
)
|
)
|
||||||
@ -126,6 +126,12 @@ endforeach()
|
|||||||
file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
|
file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
|
||||||
FILE(REMOVE ${BINARY_TOOLS})
|
FILE(REMOVE ${BINARY_TOOLS})
|
||||||
|
|
||||||
|
#if we are using dynamic linkage, the tools also require the dlls and platforms directory to run correctly
|
||||||
|
if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic)
|
||||||
|
file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/bin/*.dll")
|
||||||
|
file(INSTALL ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
|
||||||
|
file(INSTALL ${CURRENT_PACKAGES_DIR}/plugins/platforms DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
|
||||||
|
endif()
|
||||||
set(SHARE_PATH ${CURRENT_PACKAGES_DIR}/share/qt5)
|
set(SHARE_PATH ${CURRENT_PACKAGES_DIR}/share/qt5)
|
||||||
file(MAKE_DIRECTORY ${SHARE_PATH})
|
file(MAKE_DIRECTORY ${SHARE_PATH})
|
||||||
file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION ${SHARE_PATH} RENAME copyright)
|
file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION ${SHARE_PATH} RENAME copyright)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user