summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-03-16 14:55:08 (GMT)
committerBrad King <brad.king@kitware.com>2005-03-16 14:55:08 (GMT)
commitdb10dc0f1ee66d1deeb5ad4ec6bf744e452d157c (patch)
treee8b8988f93a0c3fe6249c86f6ae6fac066925c9f
parent59ae67558fc1655be705a56dd4b5057be7690ed2 (diff)
downloadCMake-db10dc0f1ee66d1deeb5ad4ec6bf744e452d157c.zip
CMake-db10dc0f1ee66d1deeb5ad4ec6bf744e452d157c.tar.gz
CMake-db10dc0f1ee66d1deeb5ad4ec6bf744e452d157c.tar.bz2
BUG: Do not add Qt wrapping test unless QT is found and QT_UIC_EXECUTABLE is found.
-rw-r--r--Source/CMakeLists.txt4
-rw-r--r--Tests/Wrapping/CMakeLists.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 7df4d0b..badbf76 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -463,7 +463,7 @@ IF(BUILD_TESTING)
QT_QT_LIBRARY
QT_UIC_EXE)
- IF (QT_FOUND)
+ IF (QT_FOUND AND QT_UIC_EXECUTABLE)
ADD_TEST(qtwrapping ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Wrapping"
@@ -474,7 +474,7 @@ IF(BUILD_TESTING)
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin"
--test-command qtwrapping
)
- ENDIF (QT_FOUND)
+ ENDIF (QT_FOUND AND QT_UIC_EXECUTABLE)
ADD_TEST(testdriver1 ${CMAKE_CTEST_COMMAND}
--build-and-test
diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt
index cbf23c0..d7adc4f 100644
--- a/Tests/Wrapping/CMakeLists.txt
+++ b/Tests/Wrapping/CMakeLists.txt
@@ -104,7 +104,7 @@ SET (QT_MOC_EXE "echo")
INCLUDE( ${CMAKE_ROOT}/Modules/FindQt.cmake )
-IF (QT_FOUND)
+IF (QT_FOUND AND QT_UIC_EXECUTABLE)
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
@@ -132,7 +132,7 @@ IF (QT_FOUND)
TARGET_LINK_LIBRARIES(qtwrapping myqtlib)
TARGET_LINK_LIBRARIES( qtwrapping ${QT_LIBRARIES} )
-ENDIF (QT_FOUND)
+ENDIF (QT_FOUND AND QT_UIC_EXECUTABLE)
#
# FLTK Wrappers