aboutsummaryrefslogtreecommitdiff
path: root/ports/wxchartdir
diff options
context:
space:
mode:
authorras0219 <533828+ras0219@users.noreply.github.com>2021-02-08 18:30:48 -0800
committerGitHub <noreply@github.com>2021-02-08 18:30:48 -0800
commitea11604579181b0ff790be223ee3ded3068142f9 (patch)
tree59029f22c2752728954c3301f715ba9e07d8d363 /ports/wxchartdir
parent5957dcb91255b962c484093e33bc9414b6f3e29c (diff)
downloadvcpkg-ea11604579181b0ff790be223ee3ded3068142f9.tar.gz
vcpkg-ea11604579181b0ff790be223ee3ded3068142f9.zip
[wxwidgets] Fix #4756 (#13361)
* [wxwidgets] Fix #4756 * [wxwidgets] Avoid replacing FindwxWidgets from CMake * [wxwidgets] Provide usage information * [gppanel] Use built-in CMake module * [wxchartdir] Use built-in CMake module * [wxwidgets] Fixup for applocal-ing * [wxwidgets] Fix osx builds * Update port_versions * [gppanel][wxchartdir][wxwidgets] Change versioning schemas Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Diffstat (limited to 'ports/wxchartdir')
-rw-r--r--ports/wxchartdir/CONTROL5
-rw-r--r--ports/wxchartdir/portfile.cmake13
-rw-r--r--ports/wxchartdir/vcpkg.json11
3 files changed, 11 insertions, 18 deletions
diff --git a/ports/wxchartdir/CONTROL b/ports/wxchartdir/CONTROL
deleted file mode 100644
index 22a741956..000000000
--- a/ports/wxchartdir/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: wxchartdir
-Version: 1.0.0
-Build-Depends: chartdir, wxwidgets
-Homepage: https://github.com/utelle/wxchartdir
-Description: wxChartDir provides components for the integration and use of the commercial C++ library ChartDirector, a universal chart component developed by Advanced Software Engineering Ltd, in wxWidgets based applications.
diff --git a/ports/wxchartdir/portfile.cmake b/ports/wxchartdir/portfile.cmake
index 0e2052ec2..2947d7922 100644
--- a/ports/wxchartdir/portfile.cmake
+++ b/ports/wxchartdir/portfile.cmake
@@ -10,22 +10,9 @@ vcpkg_from_github(
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-vcpkg_from_github(
- OUT_SOURCE_PATH VCPKG_WX_FIND_SOURCE_PATH
- REPO CaeruleusAqua/vcpkg-wx-find
- REF 17993e942f677799b488a06ca659a8e46ff272c9
- SHA512 0fe07d3669f115c9b6a761abd7743f87e67f24d1eae3f3abee4715fa4d6b76af0d1ea3a4bd82dbdbed430ae50295e1722615ce0ee7d46182125f5048185ee153
- HEAD_REF master
-)
-
-file(COPY ${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake DESTINATION ${VCPKG_WX_FIND_SOURCE_PATH})
-file(COPY ${CMAKE_ROOT}/Modules/FindPackageMessage.cmake DESTINATION ${VCPKG_WX_FIND_SOURCE_PATH})
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS
- -DCMAKE_MODULE_PATH=${VCPKG_WX_FIND_SOURCE_PATH}
)
vcpkg_install_cmake()
diff --git a/ports/wxchartdir/vcpkg.json b/ports/wxchartdir/vcpkg.json
new file mode 100644
index 000000000..29f8cb251
--- /dev/null
+++ b/ports/wxchartdir/vcpkg.json
@@ -0,0 +1,11 @@
+{
+ "name": "wxchartdir",
+ "version": "1.0.0",
+ "port-version": 1,
+ "description": "wxChartDir provides components for the integration and use of the commercial C++ library ChartDirector, a universal chart component developed by Advanced Software Engineering Ltd, in wxWidgets based applications.",
+ "homepage": "https://github.com/utelle/wxchartdir",
+ "dependencies": [
+ "chartdir",
+ "wxwidgets"
+ ]
+}