diff options
| author | Franck Bettinger <bettingf@cs.man.ac.uk> | 2002-09-12 17:20:05 (GMT) |
|---|---|---|
| committer | Franck Bettinger <bettingf@cs.man.ac.uk> | 2002-09-12 17:20:05 (GMT) |
| commit | 5e6b29717e7da42e718cfd4eda89a24010fc1904 (patch) | |
| tree | 2b7e17ca60bf8d47f4115ec53f8da9f575d48739 | |
| parent | c8c89b653fb49befaa8f0771523b5254ea1a7d7e (diff) | |
| download | CMake-5e6b29717e7da42e718cfd4eda89a24010fc1904.zip CMake-5e6b29717e7da42e718cfd4eda89a24010fc1904.tar.gz CMake-5e6b29717e7da42e718cfd4eda89a24010fc1904.tar.bz2 | |
added include of FindQT.cmake
| -rw-r--r-- | Source/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | Tests/Wrapping/CMakeLists.txt | 10 |
2 files changed, 16 insertions, 7 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 3c0f30a..b329c58 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -158,11 +158,14 @@ IF(BUILD_TESTING) wrapping ${CMake_BINARY_DIR}/Tests/Wrapping/bin) - ADD_TEST(qtwrapping ${CMake_BINARY_DIR}/Source/cmaketest - ${CMake_SOURCE_DIR}/Tests/Wrapping - ${CMake_BINARY_DIR}/Tests/Wrapping - qtwrapping - ${CMake_BINARY_DIR}/Tests/Wrapping/bin) + INCLUDE ( ${CMAKE_ROOT}/Modules/FindQt.cmake ) + IF (QT_FOUND) + ADD_TEST(qtwrapping ${CMake_BINARY_DIR}/Source/cmaketest + ${CMake_SOURCE_DIR}/Tests/Wrapping + ${CMake_BINARY_DIR}/Tests/Wrapping + qtwrapping + ${CMake_BINARY_DIR}/Tests/Wrapping/bin) + ENDIF (QT_FOUND) ADD_TEST(testdriver1 ${CMake_BINARY_DIR}/Source/cmaketest ${CMake_SOURCE_DIR}/Tests/TestDriver diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt index 7d615bb..3a6d58f 100644 --- a/Tests/Wrapping/CMakeLists.txt +++ b/Tests/Wrapping/CMakeLists.txt @@ -27,7 +27,6 @@ ENDIF (EXECUTABLE_OUTPUT_PATH) # Add exe # ADD_EXECUTABLE (wrapping wrapping.cxx) -ADD_EXECUTABLE (qtwrapping qtwrappingmain.cxx QTUI_S_SRCS) # # Test VTK wrappers @@ -84,7 +83,12 @@ CONFIGURE_FILE( SET (QT_WRAP_CPP "On") SET (QT_MOC_EXE "echo") -INCLUDE( ../../Modules/FindQt.cmake ) +INCLUDE( ${CMAKE_ROOT}/Modules/FindQt.cmake ) + +IF (QT_FOUND) + +ADD_EXECUTABLE (qtwrapping qtwrappingmain.cxx QTUI_S_SRCS) + INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ./ ) @@ -99,6 +103,8 @@ SET (QTUI_SRCS ) QT_WRAP_UI (qtwrapping QTUI_H_SRCS QTUI_S_SRCS QTUI_SRCS) +ENDIF (QT_FOUND) + # # FLTK Wrappers # |