[QGIS Commit] r9222 - in trunk/qgis: src/plugins tests/src/gui

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-08-30 19:51:32 -0400 (Sat, 30 Aug 2008)
New Revision: 9222

Modified:
   trunk/qgis/src/plugins/CMakeLists.txt
   trunk/qgis/tests/src/gui/CMakeLists.txt
Log:
Disable quickprint plugin for release - will redeploy if time allows to convert to new composer code

Modified: trunk/qgis/src/plugins/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/CMakeLists.txt	2008-08-30 23:38:26 UTC (rev 9221)
+++ trunk/qgis/src/plugins/CMakeLists.txt	2008-08-30 23:51:32 UTC (rev 9222)
@@ -18,9 +18,9 @@
 
 INSTALL(FILES qgisplugin.h qgsrendererplugin.h DESTINATION ${QGIS_INCLUDE_DIR})
 
-SUBDIRS (quick_print)
+#SUBDIRS (quick_print)
 
 
 SUBDIRS (coordinate_capture dxf2shp_converter) 
 
-SUBDIRS (ogr_converter)
\ No newline at end of file
+SUBDIRS (ogr_converter)

Modified: trunk/qgis/tests/src/gui/CMakeLists.txt
===================================================================
--- trunk/qgis/tests/src/gui/CMakeLists.txt	2008-08-30 23:38:26 UTC (rev 9221)
+++ trunk/qgis/tests/src/gui/CMakeLists.txt	2008-08-30 23:51:32 UTC (rev 9222)
@@ -71,24 +71,24 @@
 #
 # QgsQuickPrint test
 #
-SET(qgis_quickprinttest_SRCS testqgsquickprint.cpp ${util_SRCS})
-SET(qgis_quickprinttest_MOC_CPPS testqgsquickprint.cpp)
-QT4_WRAP_CPP(qgis_quickprinttest_MOC_SRCS ${qgis_quickprinttest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_quickprinttestmoc ALL DEPENDS ${qgis_quickprinttest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_quickprinttest ${qgis_quickprinttest_SRCS})
-ADD_DEPENDENCIES(qgis_quickprinttest qgis_quickprinttestmoc)
-TARGET_LINK_LIBRARIES(qgis_quickprinttest ${QT_LIBRARIES} qgis_core qgis_gui)
-SET_TARGET_PROPERTIES(qgis_quickprinttest 
-  PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
-  INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
-  # For Mac OS X, the executable must be at the root of the bundle's executable folder
-  INSTALL(TARGETS qgis_quickprinttest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
-  ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/qgis_quickprinttest)
-ELSE (APPLE)
-  INSTALL(TARGETS qgis_quickprinttest RUNTIME DESTINATION ${QGIS_BIN_DIR})
-  ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/bin/qgis_quickprinttest)
-ENDIF (APPLE)
+#SET(qgis_quickprinttest_SRCS testqgsquickprint.cpp ${util_SRCS})
+#SET(qgis_quickprinttest_MOC_CPPS testqgsquickprint.cpp)
+#QT4_WRAP_CPP(qgis_quickprinttest_MOC_SRCS ${qgis_quickprinttest_MOC_CPPS})
+#ADD_CUSTOM_TARGET(qgis_quickprinttestmoc ALL DEPENDS ${qgis_quickprinttest_MOC_SRCS})
+#ADD_EXECUTABLE(qgis_quickprinttest ${qgis_quickprinttest_SRCS})
+#ADD_DEPENDENCIES(qgis_quickprinttest qgis_quickprinttestmoc)
+#TARGET_LINK_LIBRARIES(qgis_quickprinttest ${QT_LIBRARIES} qgis_core qgis_gui)
+#SET_TARGET_PROPERTIES(qgis_quickprinttest 
+#  PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
+#  INSTALL_RPATH_USE_LINK_PATH true)
+#IF (APPLE)
+#  # For Mac OS X, the executable must be at the root of the bundle's executable folder
+#  INSTALL(TARGETS qgis_quickprinttest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+#  ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/qgis_quickprinttest)
+#ELSE (APPLE)
+#  INSTALL(TARGETS qgis_quickprinttest RUNTIME DESTINATION ${QGIS_BIN_DIR})
+#  ADD_TEST(qgis_quickprinttest ${CMAKE_INSTALL_PREFIX}/bin/qgis_quickprinttest)
+#ENDIF (APPLE)