File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change 13
13
function (FIND_QCAOSSL_PLUGIN_CPP PLUGIN_REQUIRED )
14
14
15
15
# 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
17
17
AND QCA_INCLUDE_DIR AND QCA_LIBRARY
18
18
AND NOT CMAKE_CROSSCOMPILING )
19
19
@@ -38,12 +38,13 @@ function(FIND_QCAOSSL_PLUGIN_CPP PLUGIN_REQUIRED)
38
38
set (TESTCPP "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY} /CMakeTmp/qcaossl.cpp" )
39
39
file (WRITE ${TESTCPP} "${CODE} " )
40
40
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} " )
43
44
44
45
try_run (RUN_RESULT COMPILE_RESULT
45
46
${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} "
47
48
COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT
48
49
)
49
50
You can’t perform that action at this time.
0 commit comments