diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-18 10:51:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 10:51:18 -0800 |
| commit | d35866018a43c108b2fa04587917c8d53740d4e6 (patch) | |
| tree | c0f4ea145071bc6da23a99862b5004e2b6ed6af0 /ports/qwt | |
| parent | b4c041df93663f1abc82d0cfb79420fc02d4546e (diff) | |
| parent | b47b4346f8c5b09cfb9826a083fc2d034a2ea9b4 (diff) | |
| download | vcpkg-d35866018a43c108b2fa04587917c8d53740d4e6.tar.gz vcpkg-d35866018a43c108b2fa04587917c8d53740d4e6.zip | |
Merge pull request #1993 from Barath-Kannan/qt5_modular
Qt5 modular
Diffstat (limited to 'ports/qwt')
| -rw-r--r-- | ports/qwt/CONTROL | 4 | ||||
| -rw-r--r-- | ports/qwt/portfile.cmake | 34 |
2 files changed, 22 insertions, 16 deletions
diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL index dd6400764..9dcf19f5b 100644 --- a/ports/qwt/CONTROL +++ b/ports/qwt/CONTROL @@ -1,4 +1,4 @@ Source: qwt -Version: 6.1.3-2 +Version: 6.1.3-4 Description: Qt widgets library for technical applications -Build-Depends: qt5 +Build-Depends: qt5-base, qt5-svg diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake index 99f84425a..918914a01 100644 --- a/ports/qwt/portfile.cmake +++ b/ports/qwt/portfile.cmake @@ -21,44 +21,50 @@ else() ) endif() -# The qwt build requires zlib1.dll -SET(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin") +set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") +set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") -vcpkg_configure_qmake( - SOURCE_PATH ${SOURCE_PATH} -) +vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}) -vcpkg_build_qmake() +vcpkg_build_qmake( + RELEASE_TARGETS sub-src-release_ordered + DEBUG_TARGETS sub-src-debug_ordered +) -# Install following vcpkg conventions -set(BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +#Set the correct install directory to packages +foreach(MAKEFILE ${RELEASE_MAKEFILES} ${DEBUG_MAKEFILES}) + vcpkg_replace_string(${MAKEFILE} "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}") +endforeach() +#Install the header files file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h) file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/qwt) +#Install the module files file(INSTALL - ${BUILD_DIR}/lib/qwt.lib + ${RELEASE_DIR}/lib/qwt.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) file(INSTALL - ${BUILD_DIR}/lib/qwtd.lib + ${DEBUG_DIR}/lib/qwtd.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(INSTALL - ${BUILD_DIR}/lib/qwt.dll + ${RELEASE_DIR}/lib/qwt.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) file(INSTALL - ${BUILD_DIR}/lib/qwtd.dll - ${BUILD_DIR}/lib/qwtd.pdb + ${DEBUG_DIR}/lib/qwtd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin ) endif() +vcpkg_copy_pdbs() + # Handle copyright file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/qwt) file(RENAME ${CURRENT_PACKAGES_DIR}/share/qwt/COPYING ${CURRENT_PACKAGES_DIR}/share/qwt/copyright) |