[cmake-commits] hoffman committed CMakeLists.txt 1.38 1.38.2.1

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Nov 28 14:19:48 EST 2006


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

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt 
Log Message:
ENH: merge in changes from the main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Wrapping/CMakeLists.txt,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -d -r1.38 -r1.38.2.1
--- CMakeLists.txt	9 Jan 2006 19:40:31 -0000	1.38
+++ CMakeLists.txt	28 Nov 2006 19:19:45 -0000	1.38.2.1
@@ -104,8 +104,8 @@
 SET (QT_MOC_EXE "echo")
 INCLUDE( FindQt3 )
 
-IF (QT_FOUND AND QT_UIC_EXECUTABLE)
-
+IF (QT_FOUND AND QT_WRAP_UI)
+  message("found qt 3 test it...")
   INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
   INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
 
@@ -132,7 +132,7 @@
   TARGET_LINK_LIBRARIES(qtwrapping myqtlib)
 
   TARGET_LINK_LIBRARIES( qtwrapping ${QT_LIBRARIES} )
-ENDIF (QT_FOUND AND QT_UIC_EXECUTABLE)
+ENDIF (QT_FOUND AND QT_WRAP_UI)
 
 #
 # FLTK Wrappers



More information about the Cmake-commits mailing list