Commit db10dc0f authored by Brad King's avatar Brad King
Browse files

BUG: Do not add Qt wrapping test unless QT is found and QT_UIC_EXECUTABLE is found.

parent 59ae6755
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment