Skip to content

Commit 25ba361

Browse files
lbartolettinyalldawson
authored andcommitted
Fix QCA-ssl for FreeBSD
1 parent a26b9b1 commit 25ba361

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

cmake/QCAMacros.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212

1313
function(FIND_QCAOSSL_PLUGIN_CPP PLUGIN_REQUIRED)
1414

15+
FIND_PACKAGE(Qt5Core QUIET)
1516
# requires Qt and QCA packages to be found
16-
if(QT_INCLUDE_DIR AND QT_QTCORE_INCLUDE_DIR AND Qt5Core_LIBRARIES
17+
if(Qt5Core_INCLUDE_DIRS AND Qt5Core_LIBRARIES
1718
AND QCA_INCLUDE_DIR AND QCA_LIBRARY
1819
AND NOT CMAKE_CROSSCOMPILING)
1920

@@ -92,7 +93,7 @@ function(FIND_QCATOOL TOOL_REQUIRED)
9293
$ENV{OSGEO4W_ROOT}/bin
9394
)
9495
else()
95-
find_program(QCATOOL_EXECUTABLE NAMES qcatool qcatool2 qcatool-qt5)
96+
find_program(QCATOOL_EXECUTABLE NAMES qcatool-qt5 qcatool2 qcatool)
9697
endif()
9798

9899
if(NOT QCATOOL_EXECUTABLE)

0 commit comments

Comments
 (0)