Skip to content

Commit 9bb3235

Browse files
committed
Update finding QCA OSSL plugin for Qt5 and C++11
1 parent 74dfd1f commit 9bb3235

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

cmake/QCAMacros.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
function(FIND_QCAOSSL_PLUGIN_CPP PLUGIN_REQUIRED)
1414

1515
# requires Qt and QCA packages to be found
16-
if(QT_INCLUDE_DIR AND QT_QTCORE_INCLUDE_DIR AND QT_QTCORE_LIBRARY
16+
if(QT_INCLUDES AND Qt5Core_LIBRARIES
1717
AND QCA_INCLUDE_DIR AND QCA_LIBRARY
1818
AND NOT CMAKE_CROSSCOMPILING)
1919

@@ -38,12 +38,13 @@ function(FIND_QCAOSSL_PLUGIN_CPP PLUGIN_REQUIRED)
3838
set(TESTCPP "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/qcaossl.cpp")
3939
file(WRITE ${TESTCPP} "${CODE}")
4040

41-
set(QCA_INCLUDE_DIRECTORIES "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDE_DIR};${QT_QTCORE_INCLUDE_DIR};${QCA_INCLUDE_DIR}")
42-
set(QCA_LINK_LIBRARIES "-DLINK_LIBRARIES:STRING=${QT_QTCORE_LIBRARY};${QCA_LIBRARY}")
41+
set(QCA_INCLUDE_DIRECTORIES "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES};${QCA_INCLUDE_DIR}")
42+
get_target_property(_QtCore_path Qt5::Core LOCATION)
43+
set(QCA_LINK_LIBRARIES "-DLINK_LIBRARIES:STRING=${_QtCore_path};${QCA_LIBRARY}")
4344

4445
try_run(RUN_RESULT COMPILE_RESULT
4546
${CMAKE_BINARY_DIR} ${TESTCPP}
46-
CMAKE_FLAGS "${QCA_INCLUDE_DIRECTORIES}" "${QCA_LINK_LIBRARIES}"
47+
CMAKE_FLAGS "-DCMAKE_CXX_STANDARD=11" "${QCA_INCLUDE_DIRECTORIES}" "${QCA_LINK_LIBRARIES}"
4748
COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT
4849
)
4950

0 commit comments

Comments
 (0)