mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 00:20:40 -04:00
63ae23ca43
- fix libproj detection: Our graphics proj is built with autotools and thus does not install it's cmake files. Patches provide an alternate method for finding libproj using pkg-config, see: https://sourceforge.net/p/qlandkartegt/mailman/message/36639866/ - fix a crash with current Qt when no GPS device is found (which at least for me is the default case): since the last Qt update, QList aborts on an assertion when trying to access the first element of an empty list. PR: 237425 Submitted by: cmt
22 lines
781 B
Text
22 lines
781 B
Text
--- CMakeLists.txt.orig 2019-04-08 16:08:10 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -43,6 +43,7 @@ include(TranslateDesktop)
|
|
include(DefineCMakeDefaults)
|
|
include(DefineCompilerFlags)
|
|
include(DefineInstallationPaths)
|
|
+include(FindPkgConfig)
|
|
include(CPackConfig.cmake)
|
|
include(ConfigureChecks.cmake)
|
|
|
|
@@ -135,7 +136,10 @@ find_package(Qt5Network REQUIRED)
|
|
find_package(Qt5WebEngineWidgets REQUIRED)
|
|
find_package(Qt5Qml REQUIRED)
|
|
find_package(GDAL REQUIRED)
|
|
-find_package(PROJ4 REQUIRED)
|
|
+find_package(PROJ4)
|
|
+if (NOT PROJ4_FOUND)
|
|
+ pkg_search_module(PROJ4 REQUIRED proj)
|
|
+endif()
|
|
find_package(JPEG REQUIRED)
|
|
find_package(ROUTINO REQUIRED)
|
|
find_package(QuaZip5 REQUIRED)
|