[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebindings/smoke/qt
From: Arno Rehn <kde () arnorehn ! de>
Date: 2010-01-22 17:02:19
Message-ID: 1264179739.501476.16119.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1078706 by arnorehn:
fix build with recent FindQt4.cmake changes
M +9 -2 QtGuess.txt
--- trunk/KDE/kdebindings/smoke/qt/QtGuess.txt #1078705:1078706
@@ -136,13 +136,20 @@
message(STATUS "Checking how Qt was built...")
message(STATUS "Threshold is set to ${qt_test_threshold}")
+
+include (HandleImportedTargetsInCMakeRequiredLibraries)
+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_SYSTEM_INCLUDE_PATH} ${QT_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} \
${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTOPENGL_LIBRARY} \
${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY}) \
+HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES(_CMAKE_REQUIRED_LIBRARIES) +
foreach(test_target ${test_targets})
file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/test-${test_target})
+
try_compile(test_result "${CMAKE_CURRENT_BINARY_DIR}/test-${test_target}"
${CMAKE_CURRENT_SOURCE_DIR}/tests/test.cpp
COMPILE_DEFINITIONS -DTEST_${test_target}
- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_SYSTEM_INCLUDE_PATH};${QT_INCLUDE_DIR}"
- "-DLINK_LIBRARIES:STRING=${QT_QTCORE_LIBRARY};${QT_QTDBUS_LIBRARY};${QT_QTGUI_LIB \
RARY};${QT_QTNETWORK_LIBRARY};${QT_QTOPENGL_LIBRARY};${QT_QTXML_LIBRARY};${QT_QTSVG_LIBRARY}")
+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+ "-DLINK_LIBRARIES:STRING=${_CMAKE_REQUIRED_LIBRARIES}")
if(test_result)
message(STATUS "${test_target} *Undefined*")
else(test_result)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic