Browse Source

added include of FindQT.cmake

Franck Bettinger 23 years ago
parent
commit
5e6b29717e
2 changed files with 16 additions and 7 deletions
  1. 8 5
      Source/CMakeLists.txt
  2. 8 2
      Tests/Wrapping/CMakeLists.txt

+ 8 - 5
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 

+ 8 - 2
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
 #