aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralexsmn <alexsmn@gmail.com>2018-05-31 11:11:57 -0600
committerRobert Schumacher <roschuma@microsoft.com>2018-05-31 10:11:57 -0700
commit5a67a5fa29dd41f4644132a64569df98489196d4 (patch)
tree5b2ba5cb3b43a2c161ac997a7a26250cf1be1a18
parent8770a014ece92b6cdc800b5788d4885a0065b5e8 (diff)
downloadvcpkg-5a67a5fa29dd41f4644132a64569df98489196d4.tar.gz
vcpkg-5a67a5fa29dd41f4644132a64569df98489196d4.zip
Add qt5-activeqt library. (#3347)
-rw-r--r--ports/qt5-activeqt/CONTROL4
-rw-r--r--ports/qt5-activeqt/portfile.cmake7
-rw-r--r--ports/qt5-modularscripts/CONTROL2
-rw-r--r--ports/qt5-modularscripts/qt_modular_library.cmake2
4 files changed, 14 insertions, 1 deletions
diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
new file mode 100644
index 000000000..539089765
--- /dev/null
+++ b/ports/qt5-activeqt/CONTROL
@@ -0,0 +1,4 @@
+Source: qt5-activeqt
+Version: 5.9.2-0
+Description: Qt5 ActiveQt Module - ActiveX components
+Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake
new file mode 100644
index 000000000..adf9e6282
--- /dev/null
+++ b/ports/qt5-activeqt/portfile.cmake
@@ -0,0 +1,7 @@
+include(vcpkg_common_functions)
+
+include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
+
+qt_modular_library(qtactiveqt c013e5cba0b11af88161d3cad21923c4b3bf04b0905e5b0c527c1984806d0eb39f31322ff464b139f5d36b5c9f4afefe70492fc1e1f0e964e6e0eaa3f6edaaf9)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts)
diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL
index fd3f72392..73460375c 100644
--- a/ports/qt5-modularscripts/CONTROL
+++ b/ports/qt5-modularscripts/CONTROL
@@ -1,3 +1,3 @@
Source: qt5-modularscripts
-Version: 3
+Version: 4
Description: Vcpkg helpers to package qt5 modules
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake
index 1ead66d83..cd269bb4d 100644
--- a/ports/qt5-modularscripts/qt_modular_library.cmake
+++ b/ports/qt5-modularscripts/qt_modular_library.cmake
@@ -132,6 +132,8 @@ function(qt_modular_library NAME HASH)
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPLv3")
elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3")
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3")
+ elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT")
+ set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT")
endif()
file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)