mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 19:42:46 +08:00
[qt5] Build qt5 release/debug targets according to VCPKG_BUILD_TYPE (#6215)
This commit is contained in:
João Maia
Phil Christensen
parent
7ec28764b6
commit
d299ad6107
@ -24,46 +24,49 @@ function(configure_qt)
|
|||||||
else()
|
else()
|
||||||
set(CONFIGURE_BAT "configure")
|
set(CONFIGURE_BAT "configure")
|
||||||
endif()
|
endif()
|
||||||
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
|
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
|
||||||
|
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
|
||||||
|
vcpkg_execute_required_process(
|
||||||
|
COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}
|
||||||
|
-debug
|
||||||
|
-prefix ${CURRENT_INSTALLED_DIR}/debug
|
||||||
|
-extprefix ${CURRENT_PACKAGES_DIR}/debug
|
||||||
|
-hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5
|
||||||
|
-archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
|
||||||
|
-datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
|
||||||
|
-plugindir ${CURRENT_INSTALLED_DIR}/debug/plugins
|
||||||
|
-qmldir ${CURRENT_INSTALLED_DIR}/debug/qml
|
||||||
|
-headerdir ${CURRENT_PACKAGES_DIR}/include
|
||||||
|
-I ${CURRENT_INSTALLED_DIR}/include
|
||||||
|
-L ${CURRENT_INSTALLED_DIR}/debug/lib
|
||||||
|
-platform ${_csc_PLATFORM}
|
||||||
|
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
|
||||||
|
LOGNAME config-${TARGET_TRIPLET}-dbg
|
||||||
|
)
|
||||||
|
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
|
||||||
|
endif()
|
||||||
|
|
||||||
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
|
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
|
||||||
vcpkg_execute_required_process(
|
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
|
||||||
COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG}
|
vcpkg_execute_required_process(
|
||||||
-debug
|
COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}
|
||||||
-prefix ${CURRENT_INSTALLED_DIR}/debug
|
-release
|
||||||
-extprefix ${CURRENT_PACKAGES_DIR}/debug
|
-prefix ${CURRENT_INSTALLED_DIR}
|
||||||
-hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5
|
-extprefix ${CURRENT_PACKAGES_DIR}
|
||||||
-archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
|
-hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5
|
||||||
-datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
|
-archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5
|
||||||
-plugindir ${CURRENT_INSTALLED_DIR}/debug/plugins
|
-datadir ${CURRENT_INSTALLED_DIR}/share/qt5
|
||||||
-qmldir ${CURRENT_INSTALLED_DIR}/debug/qml
|
-plugindir ${CURRENT_INSTALLED_DIR}/plugins
|
||||||
-headerdir ${CURRENT_PACKAGES_DIR}/include
|
-qmldir ${CURRENT_INSTALLED_DIR}/qml
|
||||||
-I ${CURRENT_INSTALLED_DIR}/include
|
-I ${CURRENT_INSTALLED_DIR}/include
|
||||||
-L ${CURRENT_INSTALLED_DIR}/debug/lib
|
-L ${CURRENT_INSTALLED_DIR}/lib
|
||||||
-platform ${_csc_PLATFORM}
|
-platform ${_csc_PLATFORM}
|
||||||
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
|
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
|
||||||
LOGNAME config-${TARGET_TRIPLET}-dbg
|
LOGNAME config-${TARGET_TRIPLET}-rel
|
||||||
)
|
)
|
||||||
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
|
message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
|
||||||
|
endif()
|
||||||
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
|
|
||||||
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
|
|
||||||
vcpkg_execute_required_process(
|
|
||||||
COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE}
|
|
||||||
-release
|
|
||||||
-prefix ${CURRENT_INSTALLED_DIR}
|
|
||||||
-extprefix ${CURRENT_PACKAGES_DIR}
|
|
||||||
-hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5
|
|
||||||
-archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5
|
|
||||||
-datadir ${CURRENT_INSTALLED_DIR}/share/qt5
|
|
||||||
-plugindir ${CURRENT_INSTALLED_DIR}/plugins
|
|
||||||
-qmldir ${CURRENT_INSTALLED_DIR}/qml
|
|
||||||
-I ${CURRENT_INSTALLED_DIR}/include
|
|
||||||
-L ${CURRENT_INSTALLED_DIR}/lib
|
|
||||||
-platform ${_csc_PLATFORM}
|
|
||||||
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
|
|
||||||
LOGNAME config-${TARGET_TRIPLET}-rel
|
|
||||||
)
|
|
||||||
message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
|
|
||||||
|
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|||||||
@ -28,34 +28,38 @@ function(install_qt)
|
|||||||
vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}")
|
vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}")
|
||||||
set(_path "$ENV{PATH}")
|
set(_path "$ENV{PATH}")
|
||||||
|
|
||||||
message(STATUS "Package ${TARGET_TRIPLET}-dbg")
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin")
|
message(STATUS "Package ${TARGET_TRIPLET}-dbg")
|
||||||
vcpkg_execute_required_process(
|
vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin")
|
||||||
COMMAND ${INVOKE}
|
vcpkg_execute_required_process(
|
||||||
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
|
COMMAND ${INVOKE}
|
||||||
LOGNAME build-${TARGET_TRIPLET}-dbg
|
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
|
||||||
)
|
LOGNAME build-${TARGET_TRIPLET}-dbg
|
||||||
vcpkg_execute_required_process(
|
)
|
||||||
COMMAND ${INVOKE} install
|
vcpkg_execute_required_process(
|
||||||
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
|
COMMAND ${INVOKE} install
|
||||||
LOGNAME package-${TARGET_TRIPLET}-dbg
|
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
|
||||||
)
|
LOGNAME package-${TARGET_TRIPLET}-dbg
|
||||||
message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
|
)
|
||||||
|
message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
|
||||||
|
endif()
|
||||||
|
|
||||||
message(STATUS "Package ${TARGET_TRIPLET}-rel")
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
set(ENV{PATH} "${_path}")
|
message(STATUS "Package ${TARGET_TRIPLET}-rel")
|
||||||
vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
|
set(ENV{PATH} "${_path}")
|
||||||
vcpkg_execute_required_process(
|
vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
|
||||||
COMMAND ${INVOKE}
|
vcpkg_execute_required_process(
|
||||||
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
|
COMMAND ${INVOKE}
|
||||||
LOGNAME build-${TARGET_TRIPLET}-rel
|
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
|
||||||
)
|
LOGNAME build-${TARGET_TRIPLET}-rel
|
||||||
vcpkg_execute_required_process(
|
)
|
||||||
COMMAND ${INVOKE} install
|
vcpkg_execute_required_process(
|
||||||
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
|
COMMAND ${INVOKE} install
|
||||||
LOGNAME package-${TARGET_TRIPLET}-rel
|
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
|
||||||
)
|
LOGNAME package-${TARGET_TRIPLET}-rel
|
||||||
message(STATUS "Package ${TARGET_TRIPLET}-rel done")
|
)
|
||||||
|
message(STATUS "Package ${TARGET_TRIPLET}-rel done")
|
||||||
|
endif()
|
||||||
|
|
||||||
set(ENV{PATH} "${_path}")
|
set(ENV{PATH} "${_path}")
|
||||||
|
|
||||||
|
|||||||
@ -152,18 +152,22 @@ endif()
|
|||||||
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake)
|
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake)
|
||||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
|
||||||
|
|
||||||
file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
|
file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
|
||||||
file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
|
list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
|
||||||
file(REMOVE ${BINARY_TOOLS})
|
file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
|
||||||
file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*")
|
file(REMOVE ${BINARY_TOOLS})
|
||||||
list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
|
|
||||||
file(REMOVE ${BINARY_TOOLS})
|
|
||||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
|
||||||
endif()
|
endif()
|
||||||
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
|
file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*")
|
||||||
|
list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
|
||||||
|
file(REMOVE ${BINARY_TOOLS})
|
||||||
|
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||||
|
endif()
|
||||||
|
|
||||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
|
file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf ${CMAKE_CURRENT_LIST_DIR}/qt_release.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5)
|
||||||
|
endif()
|
||||||
|
|
||||||
vcpkg_execute_required_process(
|
vcpkg_execute_required_process(
|
||||||
COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py
|
COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py
|
||||||
@ -182,41 +186,65 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
|
|||||||
# never both. See http://doc.qt.io/qt-5/activeqt-server.html for more info.
|
# never both. See http://doc.qt.io/qt-5/activeqt-server.html for more info.
|
||||||
#
|
#
|
||||||
# Create manual-link folders:
|
# Create manual-link folders:
|
||||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
||||||
|
endif()
|
||||||
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
|
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
||||||
|
endif()
|
||||||
#
|
#
|
||||||
# Either have users explicitly link against qtmain.lib, qtmaind.lib:
|
# Either have users explicitly link against qtmain.lib, qtmaind.lib:
|
||||||
file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
||||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
|
file(COPY ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
||||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl)
|
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
|
||||||
file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qtmain.prl)
|
||||||
file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
endif()
|
||||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib)
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl)
|
file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
||||||
|
file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
||||||
|
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib)
|
||||||
|
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl)
|
||||||
|
endif()
|
||||||
|
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# Qt5Bootstrap: only used to bootstrap qmake dependencies
|
# Qt5Bootstrap: only used to bootstrap qmake dependencies
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.lib)
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.prl)
|
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.lib)
|
||||||
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.lib ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.lib)
|
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.prl)
|
||||||
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.prl ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.prl)
|
endif()
|
||||||
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
|
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.lib ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.lib)
|
||||||
|
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.prl ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.prl)
|
||||||
|
endif()
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")
|
file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")
|
||||||
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
|
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
|
||||||
|
endif()
|
||||||
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
|
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
|
||||||
|
endif()
|
||||||
foreach(PRL_FILE IN LISTS PRL_FILES)
|
foreach(PRL_FILE IN LISTS PRL_FILES)
|
||||||
file(READ "${PRL_FILE}" _contents)
|
file(READ "${PRL_FILE}" _contents)
|
||||||
string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
string(REPLACE "${CMAKE_DEBUG_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
|
string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
|
||||||
|
endif()
|
||||||
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
|
string(REPLACE "${CMAKE_DEBUG_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
|
||||||
|
endif()
|
||||||
file(WRITE "${PRL_FILE}" "${_contents}")
|
file(WRITE "${PRL_FILE}" "${_contents}")
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins)
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins)
|
file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins)
|
||||||
|
endif()
|
||||||
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
|
file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins)
|
||||||
|
endif()
|
||||||
|
|
||||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5core)
|
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5core)
|
||||||
|
|
||||||
|
|||||||
@ -31,8 +31,12 @@ function(qt_modular_build_library SOURCE_PATH)
|
|||||||
set(ENV{_CL_} "/utf-8")
|
set(ENV{_CL_} "/utf-8")
|
||||||
|
|
||||||
#Store build paths
|
#Store build paths
|
||||||
set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
||||||
|
endif()
|
||||||
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
|
set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
||||||
|
endif()
|
||||||
|
|
||||||
#Find Python and add it to the path
|
#Find Python and add it to the path
|
||||||
vcpkg_find_acquire_program(PYTHON2)
|
vcpkg_find_acquire_program(PYTHON2)
|
||||||
@ -86,8 +90,12 @@ function(qt_modular_build_library SOURCE_PATH)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")
|
file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")
|
||||||
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
|
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/lib" CMAKE_RELEASE_LIB_PATH)
|
||||||
|
endif()
|
||||||
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||||
|
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib" CMAKE_DEBUG_LIB_PATH)
|
||||||
|
endif()
|
||||||
foreach(PRL_FILE IN LISTS PRL_FILES)
|
foreach(PRL_FILE IN LISTS PRL_FILES)
|
||||||
file(READ "${PRL_FILE}" _contents)
|
file(READ "${PRL_FILE}" _contents)
|
||||||
string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
|
string(REPLACE "${CMAKE_RELEASE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
|
||||||
|
|||||||
@ -30,26 +30,30 @@ function(vcpkg_configure_qmake)
|
|||||||
# Cleanup build directories
|
# Cleanup build directories
|
||||||
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
|
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
|
||||||
|
|
||||||
configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf)
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
|
configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf)
|
||||||
|
|
||||||
|
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
|
||||||
|
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
|
||||||
|
vcpkg_execute_required_process(
|
||||||
|
COMMAND ${QMAKE_COMMAND} CONFIG-=debug CONFIG+=release ${_csc_OPTIONS} ${_csc_SOURCE_PATH} -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf"
|
||||||
|
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
|
||||||
|
LOGNAME config-${TARGET_TRIPLET}-rel
|
||||||
|
)
|
||||||
|
message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
|
||||||
|
endif()
|
||||||
|
|
||||||
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
|
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
||||||
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
|
configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_debug.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf)
|
||||||
vcpkg_execute_required_process(
|
|
||||||
COMMAND ${QMAKE_COMMAND} CONFIG-=debug CONFIG+=release ${_csc_OPTIONS} ${_csc_SOURCE_PATH} -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf"
|
|
||||||
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
|
|
||||||
LOGNAME config-${TARGET_TRIPLET}-rel
|
|
||||||
)
|
|
||||||
message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
|
|
||||||
|
|
||||||
configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_debug.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf)
|
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
|
||||||
|
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
|
||||||
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
|
vcpkg_execute_required_process(
|
||||||
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
|
COMMAND ${QMAKE_COMMAND} CONFIG-=release CONFIG+=debug ${_csc_OPTIONS} ${_csc_SOURCE_PATH} -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf"
|
||||||
vcpkg_execute_required_process(
|
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
|
||||||
COMMAND ${QMAKE_COMMAND} CONFIG-=release CONFIG+=debug ${_csc_OPTIONS} ${_csc_SOURCE_PATH} -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf"
|
LOGNAME config-${TARGET_TRIPLET}-dbg
|
||||||
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
|
)
|
||||||
LOGNAME config-${TARGET_TRIPLET}-dbg
|
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
|
||||||
)
|
endif()
|
||||||
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
|
|
||||||
|
|
||||||
endfunction()
|
endfunction()
|
||||||
Loading…
Reference in New Issue
Block a user