aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLong Huan <8551701+longhuan2018@users.noreply.github.com>2019-09-10 02:29:33 +0800
committerVictor Romero <romerosanchezv@gmail.com>2019-09-09 11:29:33 -0700
commit43fea7c61f23cf8c8f49c36b5a56541216d9fd2b (patch)
treed9afb7f4d4b43ec387cc402785ed7090e7d4b31a
parentd30e775286f1676198de0649000022e0e9e4813f (diff)
downloadvcpkg-43fea7c61f23cf8c8f49c36b5a56541216d9fd2b.tar.gz
vcpkg-43fea7c61f23cf8c8f49c36b5a56541216d9fd2b.zip
[qwt]make qwt support unix (#8030)
* make qwt support unix * [qwt] Bump CONTROL version
-rw-r--r--ports/qwt/CONTROL2
-rw-r--r--ports/qwt/portfile.cmake50
2 files changed, 25 insertions, 27 deletions
diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL
index c1271a72f..62235f3c3 100644
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@@ -1,5 +1,5 @@
Source: qwt
-Version: 6.1.3-7
+Version: 6.1.3-8
Homepage: https://sourceforge.net/projects/qwt
Description: Qt widgets library for technical applications
Build-Depends: qt5-base, qt5-svg, qt5-tools
diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake
index 002272e24..ca5762d42 100644
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@@ -21,10 +21,17 @@ vcpkg_configure_qmake(
CONFIG+=${VCPKG_LIBRARY_LINKAGE}
)
-vcpkg_build_qmake(
- RELEASE_TARGETS sub-src-release_ordered
- DEBUG_TARGETS sub-src-debug_ordered
-)
+if (CMAKE_HOST_WIN32)
+ vcpkg_build_qmake(
+ RELEASE_TARGETS sub-src-release_ordered
+ DEBUG_TARGETS sub-src-debug_ordered
+ )
+elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX
+ vcpkg_build_qmake(
+ RELEASE_TARGETS sub-src-all-ordered
+ DEBUG_TARGETS sub-src-all-ordered
+ )
+endif()
#Set the correct install directory to packages
foreach(MAKEFILE ${RELEASE_MAKEFILES} ${DEBUG_MAKEFILES})
@@ -36,30 +43,21 @@ file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/qwt)
#Install the module files
-file(INSTALL
- ${RELEASE_DIR}/lib/qwt.lib
- DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
-
-file(INSTALL
- ${DEBUG_DIR}/lib/qwtd.lib
- DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- file(INSTALL
- ${RELEASE_DIR}/lib/qwt.dll
- DESTINATION ${CURRENT_PACKAGES_DIR}/bin
- )
-
- file(INSTALL
- ${DEBUG_DIR}/lib/qwtd.dll
- DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
- )
+if (CMAKE_HOST_WIN32)
+ file(INSTALL ${RELEASE_DIR}/lib/qwt.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+ file(INSTALL ${DEBUG_DIR}/lib/qwtd.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+
+ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+ file(INSTALL ${RELEASE_DIR}/lib/qwt.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+ file(INSTALL ${DEBUG_DIR}/lib/qwtd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+ endif()
+ vcpkg_copy_pdbs()
+elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX
+ file(INSTALL ${RELEASE_DIR}/lib/libqwt.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+ file(INSTALL ${DEBUG_DIR}/lib/libqwt.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
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)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/qwt/COPYING ${CURRENT_PACKAGES_DIR}/share/qwt/copyright) \ No newline at end of file