From 25ba36180cfbf836b9458beb98e28f62349c4260 Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Thu, 31 May 2018 11:34:07 +0200 Subject: [PATCH] Fix QCA-ssl for FreeBSD --- cmake/QCAMacros.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/QCAMacros.cmake b/cmake/QCAMacros.cmake index 0c1a9dd40f0..b0196ce8ac9 100644 --- a/cmake/QCAMacros.cmake +++ b/cmake/QCAMacros.cmake @@ -12,8 +12,9 @@ function(FIND_QCAOSSL_PLUGIN_CPP PLUGIN_REQUIRED) + FIND_PACKAGE(Qt5Core QUIET) # requires Qt and QCA packages to be found - if(QT_INCLUDE_DIR AND QT_QTCORE_INCLUDE_DIR AND Qt5Core_LIBRARIES + if(Qt5Core_INCLUDE_DIRS AND Qt5Core_LIBRARIES AND QCA_INCLUDE_DIR AND QCA_LIBRARY AND NOT CMAKE_CROSSCOMPILING) @@ -92,7 +93,7 @@ function(FIND_QCATOOL TOOL_REQUIRED) $ENV{OSGEO4W_ROOT}/bin ) else() - find_program(QCATOOL_EXECUTABLE NAMES qcatool qcatool2 qcatool-qt5) + find_program(QCATOOL_EXECUTABLE NAMES qcatool-qt5 qcatool2 qcatool) endif() if(NOT QCATOOL_EXECUTABLE)