[cmake-commits] hoffman committed CMakeLists.txt 1.33 1.34

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Nov 2 10:46:05 EDT 2007


Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv18328/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: remove findqt3 from cmake's cmakelist files


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- CMakeLists.txt	10 Oct 2007 15:06:14 -0000	1.33
+++ CMakeLists.txt	2 Nov 2007 14:46:03 -0000	1.34
@@ -333,27 +333,16 @@
     --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



More information about the Cmake-commits mailing list