kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brad King 2005-03-16 09:55:08 -05:00
parent 59ae67558f
commit db10dc0f1e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CMakeLists.txt
View File

@ -463,7 +463,7 @@ IF(BUILD_TESTING)
QT_QT_LIBRARY QT_QT_LIBRARY
QT_UIC_EXE) QT_UIC_EXE)
IF (QT_FOUND) IF (QT_FOUND AND QT_UIC_EXECUTABLE)
ADD_TEST(qtwrapping ${CMAKE_CTEST_COMMAND} ADD_TEST(qtwrapping ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/Wrapping" "${CMake_SOURCE_DIR}/Tests/Wrapping"
@ -474,7 +474,7 @@ IF(BUILD_TESTING)
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin" --build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin"
--test-command qtwrapping --test-command qtwrapping
) )
ENDIF (QT_FOUND) ENDIF (QT_FOUND AND QT_UIC_EXECUTABLE)
ADD_TEST(testdriver1 ${CMAKE_CTEST_COMMAND} ADD_TEST(testdriver1 ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test

4
Tests/Wrapping/CMakeLists.txt
View File

@ -104,7 +104,7 @@ SET (QT_MOC_EXE "echo")
INCLUDE( ${CMAKE_ROOT}/Modules/FindQt.cmake ) INCLUDE( ${CMAKE_ROOT}/Modules/FindQt.cmake )
IF (QT_FOUND) IF (QT_FOUND AND QT_UIC_EXECUTABLE)
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
@ -132,7 +132,7 @@ IF (QT_FOUND)
TARGET_LINK_LIBRARIES(qtwrapping myqtlib) TARGET_LINK_LIBRARIES(qtwrapping myqtlib)
TARGET_LINK_LIBRARIES( qtwrapping ${QT_LIBRARIES} ) TARGET_LINK_LIBRARIES( qtwrapping ${QT_LIBRARIES} )
ENDIF (QT_FOUND) ENDIF (QT_FOUND AND QT_UIC_EXECUTABLE)
# #
# FLTK Wrappers # FLTK Wrappers