Просмотр исходного кода

ENH: remove findqt3 from cmake's cmakelist files

Bill Hoffman 18 лет назад
Родитель
Сommit
dcf21dd90b
3 измененных файлов с 15 добавлено и 19 удалено
  1. 8 19
      Tests/CMakeLists.txt
  2. 2 0
      Tests/Wrapping/CMakeLists.txt
  3. 5 0
      Tests/Wrapping/qtnoqtmain.cxx

+ 8 - 19
Tests/CMakeLists.txt

@@ -333,27 +333,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
     --build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin"
     --test-command wrapping
     )
-  # use the FindQt3.cmake from this cmake as it may not be in an 
-  # older version of cmake
-  INCLUDE (${CMAKE_SOURCE_DIR}/Modules/FindQt3.cmake)
-  MARK_AS_ADVANCED(
-    QT_INCLUDE_PATH
-    QT_MOC_EXE
-    QT_QT_LIBRARY
-    QT_UIC_EXE)
-
-  IF (QT_FOUND AND QT_WRAP_UI)
-    ADD_TEST(qtwrapping  ${CMAKE_CTEST_COMMAND}
-      --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/Wrapping"
-      "${CMake_BINARY_DIR}/Tests/Wrapping"
-      --build-generator ${CMAKE_TEST_GENERATOR}
-      --build-project Wrapping
-      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-      --build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin"
+  ADD_TEST(qtwrapping  ${CMAKE_CTEST_COMMAND}
+    --build-and-test
+    "${CMake_SOURCE_DIR}/Tests/Wrapping"
+    "${CMake_BINARY_DIR}/Tests/Wrapping"
+    --build-generator ${CMAKE_TEST_GENERATOR}
+    --build-project Wrapping
+    --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+    --build-exe-dir "${CMake_BINARY_DIR}/Tests/Wrapping/bin"
       --test-command qtwrapping
       )
-  ENDIF (QT_FOUND AND QT_WRAP_UI)
 
   ADD_TEST(testdriver1 ${CMAKE_CTEST_COMMAND}
     --build-and-test

+ 2 - 0
Tests/Wrapping/CMakeLists.txt

@@ -74,6 +74,8 @@ IF (QT_FOUND AND QT_WRAP_UI)
   TARGET_LINK_LIBRARIES(qtwrapping myqtlib)
 
   TARGET_LINK_LIBRARIES( qtwrapping ${QT_LIBRARIES} )
+ELSE (QT_FOUND AND QT_WRAP_UI)
+  ADD_EXECUTABLE (qtwrapping qtnoqtmain.cxx)
 ENDIF (QT_FOUND AND QT_WRAP_UI)
 
 #

+ 5 - 0
Tests/Wrapping/qtnoqtmain.cxx

@@ -0,0 +1,5 @@
+int main(int ac, char** av)
+{
+  return 0;
+}
+