sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-24 00:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix QCA-ssl for FreeBSD"

Browse Source 
This reverts commit 25ba36180cfbf836b9458beb98e28f62349c4260.

Breaks linux build
This commit is contained in:
Nyall Dawson 2018-06-01 08:32:46 +10:00
parent 5e3ce8ff6a
commit 8bdec09b3b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/QCAMacros.cmake
View File

@ -12,9 +12,8 @@
function(FIND_QCAOSSL_PLUGIN_CPP PLUGIN_REQUIRED)
FIND_PACKAGE(Qt5Core QUIET)
# requires Qt and QCA packages to be found
if(Qt5Core_INCLUDE_DIRS AND Qt5Core_LIBRARIES
if(QT_INCLUDE_DIR AND QT_QTCORE_INCLUDE_DIR AND Qt5Core_LIBRARIES
AND QCA_INCLUDE_DIR AND QCA_LIBRARY
AND NOT CMAKE_CROSSCOMPILING)
@ -93,7 +92,7 @@ function(FIND_QCATOOL TOOL_REQUIRED)
$ENV{OSGEO4W_ROOT}/bin
)
else()
find_program(QCATOOL_EXECUTABLE NAMES qcatool-qt5 qcatool2 qcatool)
find_program(QCATOOL_EXECUTABLE NAMES qcatool qcatool2 qcatool-qt5)
endif()
if(NOT QCATOOL_EXECUTABLE)