diff options
| author | bouyer <bouyer@pkgsrc.org> | 2019-06-03 15:20:59 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2019-06-03 15:20:59 +0000 |
| commit | 9505ba52684f80567290c8864089a8f4293ed3ba (patch) | |
| tree | 4c6a125be40624ffdec2916c9034f9e4655f189f /geography/opencpn | |
| parent | 6972bc99ba1466cec70bf7a37b26956d3784d4f3 (diff) | |
| download | pkgsrc-9505ba52684f80567290c8864089a8f4293ed3ba.tar.gz | |
Fix wxWidgets component detection with newer cmake
Diffstat (limited to 'geography/opencpn')
| -rw-r--r-- | geography/opencpn/distinfo | 4 | ||||
| -rw-r--r-- | geography/opencpn/patches/patch-CMakeLists.txt | 35 |
2 files changed, 32 insertions, 7 deletions
diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo index 9c9f2a3104e..e4e3d3ff974 100644 --- a/geography/opencpn/distinfo +++ b/geography/opencpn/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.24 2019/03/25 11:34:05 bouyer Exp $ +$NetBSD: distinfo,v 1.25 2019/06/03 15:20:59 bouyer Exp $ SHA1 (OpenCPN-5.0.0.zip) = e4f2c77001fafed835c2329a1f2a74afdd4858ca RMD160 (OpenCPN-5.0.0.zip) = e8ee55b1b00017f2fc885c147e8f69ec13c627aa SHA512 (OpenCPN-5.0.0.zip) = 146fe0bf29424f72138168cd20617aabc2f130d2ffd47b8da4aa1e0aa6d7176093b36d96d8f0d456af1f7805db13ed87be67f4f3af7a7a2d6abf0d5734834f7a Size (OpenCPN-5.0.0.zip) = 70056870 bytes -SHA1 (patch-CMakeLists.txt) = 2a615ec6c11621e7b119f75d5db2b06f7f2a7221 +SHA1 (patch-CMakeLists.txt) = 797928fcc105566f5e5670920f03d38b5a779366 SHA1 (patch-FindPortaudio.cmake) = d13b7e6cf42ea5b837ea6230c16b4558e87aa16c SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = e193798a04082c3a20264214e2a3aa951f0ee514 SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 5523e8bb960306a15367a7c9a8385f3787a2baf4 diff --git a/geography/opencpn/patches/patch-CMakeLists.txt b/geography/opencpn/patches/patch-CMakeLists.txt index 742974d0e5c..4729e9d86bc 100644 --- a/geography/opencpn/patches/patch-CMakeLists.txt +++ b/geography/opencpn/patches/patch-CMakeLists.txt @@ -1,7 +1,7 @@ -$NetBSD: patch-CMakeLists.txt,v 1.9 2019/03/25 11:34:05 bouyer Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.10 2019/06/03 15:20:59 bouyer Exp $ ---- CMakeLists.txt.orig 2019-03-13 05:01:43.000000000 +0100 -+++ CMakeLists.txt 2019-03-13 12:59:52.443556322 +0100 +--- CMakeLists.txt.orig 2019-03-23 02:25:59.000000000 +0100 ++++ CMakeLists.txt 2019-06-03 15:10:23.518458870 +0200 @@ -157,7 +157,19 @@ # Based on code from nohal IF (NOT WIN32) @@ -31,7 +31,15 @@ $NetBSD: patch-CMakeLists.txt,v 1.9 2019/03/25 11:34:05 bouyer Exp $ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") SET (ARCH "i386") SET (LIB_INSTALL_DIR "lib") -@@ -1033,7 +1044,6 @@ +@@ -413,6 +424,7 @@ + SET(wxWidgets_USE_LIBS net xml html adv aui core base webview) + ENDIF() + ++ + OPTION (USE_GL "Enable OpenGL support" ON) + + # Prefer libGL.so to libOpenGL.so, see CMP0072 +@@ -1033,7 +1045,6 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID) @@ -39,7 +47,24 @@ $NetBSD: patch-CMakeLists.txt,v 1.9 2019/03/25 11:34:05 bouyer Exp $ IF(NOT OCPN_FORCE_GTK3) -@@ -2336,6 +2346,7 @@ +@@ -1053,14 +1064,14 @@ + set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3) + MESSAGE(STATUS "Building against GTK3...") + ENDIF(GTK2_FOUND) +- FIND_PACKAGE(wxWidgets) ++ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_USE_LIBS}) + if (wxWidgets_FOUND) + message(STATUS "Found wxWidgets webview add-on") + add_definitions(-DOCPN_USE_WEBVIEW) + else () + list(REMOVE_ITEM wxWidgets_USE_LIBS webview) + message(STATUS "Could not find wxWidgets webview add-on") +- FIND_PACKAGE(wxWidgets REQUIRED) ++ FIND_PACKAGE(wxWidgets REQUIRED ${wxWidgets_USE_LIBS}) + endif () + MESSAGE (STATUS "Found wxWidgets..." ) + MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}") +@@ -2336,6 +2347,7 @@ # So, add them manually. These declarations may be redundant in some architectures, but do no harm. IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl ) |