[QGIS Commit] r11650 - in trunk/qgis: cmake debian images/svg
images/themes/default src src/plugins/evis src/providers
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Sep 13 06:49:38 EDT 2009
Author: jef
Date: 2009-09-13 06:49:37 -0400 (Sun, 13 Sep 2009)
New Revision: 11650
Modified:
trunk/qgis/cmake/FindPostgres.cmake
trunk/qgis/cmake/FindSqlite3.cmake
trunk/qgis/debian/changelog
trunk/qgis/images/svg/CMakeLists.txt
trunk/qgis/images/themes/default/CMakeLists.txt
trunk/qgis/src/CMakeLists.txt
trunk/qgis/src/plugins/evis/CMakeLists.txt
trunk/qgis/src/providers/CMakeLists.txt
Log:
fix more line endings
Modified: trunk/qgis/cmake/FindPostgres.cmake
===================================================================
--- trunk/qgis/cmake/FindPostgres.cmake 2009-09-13 10:48:15 UTC (rev 11649)
+++ trunk/qgis/cmake/FindPostgres.cmake 2009-09-13 10:49:37 UTC (rev 11650)
@@ -1,90 +1,90 @@
-
-# CMake module to search for PostgreSQL library
-#
-# pg_config is searched for in POSTGRES_CONFIG dir,
-# default /usr/bin
-#
-# If it's found it sets POSTGRES_FOUND to TRUE
-# and following variables are set:
-# POSTGRES_INCLUDE_DIR
-# POSTGRES_LIBRARY
-
-IF(WIN32)
- IF (NOT POSTGRES_INCLUDE_DIR)
- FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h
- /usr/local/include
- /usr/include
- c:/msys/local/include
- "$ENV{LIB_DIR}/include/postgresql"
- "$ENV{LIB_DIR}/include"
- )
- ENDIF (NOT POSTGRES_INCLUDE_DIR)
-
- IF (NOT POSTGRES_LIBRARY)
- FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS
- /usr/local/lib
- /usr/lib
- c:/msys/local/lib
- "$ENV{LIB_DIR}/lib"
- )
- ENDIF (NOT POSTGRES_LIBRARY)
-
-ELSE(WIN32)
- IF(UNIX)
-
- SET(POSTGRES_CONFIG_PREFER_PATH "$ENV{POSTGRES_HOME}/bin" CACHE STRING "preferred path to PG (pg_config)")
- FIND_PROGRAM(POSTGRES_CONFIG pg_config
- ${POSTGRES_CONFIG_PREFER_PATH}
- /usr/bin/
- )
- # MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")
-
- IF (POSTGRES_CONFIG)
- # set INCLUDE_DIR
- EXEC_PROGRAM(${POSTGRES_CONFIG}
- ARGS --includedir
- OUTPUT_VARIABLE PG_TMP)
- SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)
-
- # set LIBRARY_DIR
- EXEC_PROGRAM(${POSTGRES_CONFIG}
- ARGS --libdir
- OUTPUT_VARIABLE PG_TMP)
- IF (APPLE)
- SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
- ELSE (APPLE)
- SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
- ENDIF (APPLE)
- ENDIF(POSTGRES_CONFIG)
-
- ENDIF(UNIX)
-ENDIF(WIN32)
-
-IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
- SET(POSTGRES_FOUND TRUE)
- IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
- SET(HAVE_PGCONFIG TRUE)
- ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
- SET(HAVE_PGCONFIG FALSE)
- ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
-ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
-
-
-IF (POSTGRES_FOUND)
-
- IF (NOT POSTGRES_FIND_QUIETLY)
- MESSAGE(STATUS "Found PostgreSQL: ${POSTGRES_LIBRARY}")
- ENDIF (NOT POSTGRES_FIND_QUIETLY)
-
-ELSE (POSTGRES_FOUND)
-
- #SET (POSTGRES_INCLUDE_DIR "")
- #SET (POSTGRES_LIBRARY "")
-
- IF (POSTGRES_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find PostgreSQL")
- ELSE (POSTGRES_FIND_REQUIRED)
- MESSAGE(STATUS "Could not find PostgreSQL")
- ENDIF (POSTGRES_FIND_REQUIRED)
-
-ENDIF (POSTGRES_FOUND)
+
+# CMake module to search for PostgreSQL library
+#
+# pg_config is searched for in POSTGRES_CONFIG dir,
+# default /usr/bin
+#
+# If it's found it sets POSTGRES_FOUND to TRUE
+# and following variables are set:
+# POSTGRES_INCLUDE_DIR
+# POSTGRES_LIBRARY
+
+IF(WIN32)
+ IF (NOT POSTGRES_INCLUDE_DIR)
+ FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h
+ /usr/local/include
+ /usr/include
+ c:/msys/local/include
+ "$ENV{LIB_DIR}/include/postgresql"
+ "$ENV{LIB_DIR}/include"
+ )
+ ENDIF (NOT POSTGRES_INCLUDE_DIR)
+
+ IF (NOT POSTGRES_LIBRARY)
+ FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS
+ /usr/local/lib
+ /usr/lib
+ c:/msys/local/lib
+ "$ENV{LIB_DIR}/lib"
+ )
+ ENDIF (NOT POSTGRES_LIBRARY)
+
+ELSE(WIN32)
+ IF(UNIX)
+
+ SET(POSTGRES_CONFIG_PREFER_PATH "$ENV{POSTGRES_HOME}/bin" CACHE STRING "preferred path to PG (pg_config)")
+ FIND_PROGRAM(POSTGRES_CONFIG pg_config
+ ${POSTGRES_CONFIG_PREFER_PATH}
+ /usr/bin/
+ )
+ # MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")
+
+ IF (POSTGRES_CONFIG)
+ # set INCLUDE_DIR
+ EXEC_PROGRAM(${POSTGRES_CONFIG}
+ ARGS --includedir
+ OUTPUT_VARIABLE PG_TMP)
+ SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)
+
+ # set LIBRARY_DIR
+ EXEC_PROGRAM(${POSTGRES_CONFIG}
+ ARGS --libdir
+ OUTPUT_VARIABLE PG_TMP)
+ IF (APPLE)
+ SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
+ ELSE (APPLE)
+ SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
+ ENDIF (APPLE)
+ ENDIF(POSTGRES_CONFIG)
+
+ ENDIF(UNIX)
+ENDIF(WIN32)
+
+IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
+ SET(POSTGRES_FOUND TRUE)
+ IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
+ SET(HAVE_PGCONFIG TRUE)
+ ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
+ SET(HAVE_PGCONFIG FALSE)
+ ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
+ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
+
+
+IF (POSTGRES_FOUND)
+
+ IF (NOT POSTGRES_FIND_QUIETLY)
+ MESSAGE(STATUS "Found PostgreSQL: ${POSTGRES_LIBRARY}")
+ ENDIF (NOT POSTGRES_FIND_QUIETLY)
+
+ELSE (POSTGRES_FOUND)
+
+ #SET (POSTGRES_INCLUDE_DIR "")
+ #SET (POSTGRES_LIBRARY "")
+
+ IF (POSTGRES_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find PostgreSQL")
+ ELSE (POSTGRES_FIND_REQUIRED)
+ MESSAGE(STATUS "Could not find PostgreSQL")
+ ENDIF (POSTGRES_FIND_REQUIRED)
+
+ENDIF (POSTGRES_FOUND)
Modified: trunk/qgis/cmake/FindSqlite3.cmake
===================================================================
--- trunk/qgis/cmake/FindSqlite3.cmake 2009-09-13 10:48:15 UTC (rev 11649)
+++ trunk/qgis/cmake/FindSqlite3.cmake 2009-09-13 10:49:37 UTC (rev 11650)
@@ -1,50 +1,50 @@
-
-# CMake module to search for Sqlite3 library
-#
-# If it's found it sets SQLITE3_FOUND to TRUE
-# and following variables are set:
-# SQLITE3_INCLUDE_DIR
-# SQLITE3_LIBRARY
-
-
-# FIND_PATH and FIND_LIBRARY normally search standard locations
-# before the specified paths. To search non-standard paths first,
-# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
-# and then again with no specified paths to search the default
-# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
-# searching for the same item do nothing.
-FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
- "$ENV{LIB_DIR}/include"
- "$ENV{LIB_DIR}/include/sqlite"
- #mingw
- c:/msys/local/include
- NO_DEFAULT_PATH
- )
-FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
-
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
- "$ENV{LIB_DIR}/lib"
- #mingw
- c:/msys/local/lib
- NO_DEFAULT_PATH
- )
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)
-
-IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
- SET(SQLITE3_FOUND TRUE)
-ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
-
-
-IF (SQLITE3_FOUND)
-
- IF (NOT SQLITE3_FIND_QUIETLY)
- MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
- ENDIF (NOT SQLITE3_FIND_QUIETLY)
-
-ELSE (SQLITE3_FOUND)
-
- IF (SQLITE3_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find Sqlite3")
- ENDIF (SQLITE3_FIND_REQUIRED)
-
-ENDIF (SQLITE3_FOUND)
+
+# CMake module to search for Sqlite3 library
+#
+# If it's found it sets SQLITE3_FOUND to TRUE
+# and following variables are set:
+# SQLITE3_INCLUDE_DIR
+# SQLITE3_LIBRARY
+
+
+# FIND_PATH and FIND_LIBRARY normally search standard locations
+# before the specified paths. To search non-standard paths first,
+# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
+# and then again with no specified paths to search the default
+# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
+# searching for the same item do nothing.
+FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
+ "$ENV{LIB_DIR}/include"
+ "$ENV{LIB_DIR}/include/sqlite"
+ #mingw
+ c:/msys/local/include
+ NO_DEFAULT_PATH
+ )
+FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
+
+FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
+ "$ENV{LIB_DIR}/lib"
+ #mingw
+ c:/msys/local/lib
+ NO_DEFAULT_PATH
+ )
+FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)
+
+IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
+ SET(SQLITE3_FOUND TRUE)
+ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
+
+
+IF (SQLITE3_FOUND)
+
+ IF (NOT SQLITE3_FIND_QUIETLY)
+ MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
+ ENDIF (NOT SQLITE3_FIND_QUIETLY)
+
+ELSE (SQLITE3_FOUND)
+
+ IF (SQLITE3_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find Sqlite3")
+ ENDIF (SQLITE3_FIND_REQUIRED)
+
+ENDIF (SQLITE3_FOUND)
Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog 2009-09-13 10:48:15 UTC (rev 11649)
+++ trunk/qgis/debian/changelog 2009-09-13 10:49:37 UTC (rev 11650)
@@ -1,6 +1,6 @@
qgis (1.3.0) UNRELEASED; urgency=low
- * new development version after 1.2 branch
+ * new upstream release
* add analysis library and raster terrain analysis plugin
* alternativly depend on libgdal1-1.6.0-grass
* include CONTRIBUTORS, TRANSLATORS and DONORS
Modified: trunk/qgis/images/svg/CMakeLists.txt
===================================================================
--- trunk/qgis/images/svg/CMakeLists.txt 2009-09-13 10:48:15 UTC (rev 11649)
+++ trunk/qgis/images/svg/CMakeLists.txt 2009-09-13 10:49:37 UTC (rev 11650)
@@ -1,24 +1,24 @@
-
-SET (SVG_DIRS
- biology
- emergency
- entertainment
- geometric
- gpsicons
- icon
- landmark
- north_arrows
- services
- sport
- symbol
- transport)
-
-
-FOREACH (SVG_DIR ${SVG_DIRS})
-
- FILE (GLOB IMAGES ${SVG_DIR}/*.svg)
-
- INSTALL (FILES ${IMAGES}
- DESTINATION ${QGIS_DATA_DIR}/svg/${SVG_DIR})
-
-ENDFOREACH (SVG_DIR)
+
+SET (SVG_DIRS
+ biology
+ emergency
+ entertainment
+ geometric
+ gpsicons
+ icon
+ landmark
+ north_arrows
+ services
+ sport
+ symbol
+ transport)
+
+
+FOREACH (SVG_DIR ${SVG_DIRS})
+
+ FILE (GLOB IMAGES ${SVG_DIR}/*.svg)
+
+ INSTALL (FILES ${IMAGES}
+ DESTINATION ${QGIS_DATA_DIR}/svg/${SVG_DIR})
+
+ENDFOREACH (SVG_DIR)
Modified: trunk/qgis/images/themes/default/CMakeLists.txt
===================================================================
--- trunk/qgis/images/themes/default/CMakeLists.txt 2009-09-13 10:48:15 UTC (rev 11649)
+++ trunk/qgis/images/themes/default/CMakeLists.txt 2009-09-13 10:49:37 UTC (rev 11650)
@@ -1,9 +1,9 @@
-
-FILE (GLOB IMAGES *.png)
-
-INSTALL (FILES ${IMAGES}
- DESTINATION ${QGIS_DATA_DIR}/themes/default)
-
-FILE (GLOB PLUG_IMAGES plugins/*.png)
-
-INSTALL (FILES ${PLUG_IMAGES} DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins)
+
+FILE (GLOB IMAGES *.png)
+
+INSTALL (FILES ${IMAGES}
+ DESTINATION ${QGIS_DATA_DIR}/themes/default)
+
+FILE (GLOB PLUG_IMAGES plugins/*.png)
+
+INSTALL (FILES ${PLUG_IMAGES} DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins)
Modified: trunk/qgis/src/CMakeLists.txt
===================================================================
--- trunk/qgis/src/CMakeLists.txt 2009-09-13 10:48:15 UTC (rev 11649)
+++ trunk/qgis/src/CMakeLists.txt 2009-09-13 10:49:37 UTC (rev 11650)
@@ -1,10 +1,10 @@
-
-SUBDIRS(core analysis ui gui app providers plugins helpviewer)
-
-IF (HAVE_PYTHON AND WITH_BINDINGS)
- SUBDIRS(python)
-ENDIF (HAVE_PYTHON AND WITH_BINDINGS)
-
-IF (APPLE)
- SUBDIRS(mac)
-ENDIF(APPLE)
+
+SUBDIRS(core analysis ui gui app providers plugins helpviewer)
+
+IF (HAVE_PYTHON AND WITH_BINDINGS)
+ SUBDIRS(python)
+ENDIF (HAVE_PYTHON AND WITH_BINDINGS)
+
+IF (APPLE)
+ SUBDIRS(mac)
+ENDIF(APPLE)
Modified: trunk/qgis/src/plugins/evis/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/evis/CMakeLists.txt 2009-09-13 10:48:15 UTC (rev 11649)
+++ trunk/qgis/src/plugins/evis/CMakeLists.txt 2009-09-13 10:49:37 UTC (rev 11650)
@@ -1,97 +1,97 @@
-IF (WIN32)
- IF (MSVC)
- ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
- ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
- ELSE (MSVC)
- ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
- ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
- ENDIF (MSVC)
-ELSE (WIN32)
- ADD_DEFINITIONS(-DGUI_EXPORT=)
- ADD_DEFINITIONS(-DCORE_EXPORT=)
-ENDIF (WIN32)
-
-########################################################
-# Files
-
-SET (evis_SRCS
- evis.cpp
-
- databaseconnection/evisdatabaseconnectiongui.cpp
- databaseconnection/evisdatabaseconnection.cpp
- databaseconnection/evisdatabaselayerfieldselectiongui.cpp
- databaseconnection/evisquerydefinition.cpp
-
- eventbrowser/evisconfiguration.cpp
- eventbrowser/evisgenericeventbrowsergui.cpp
- eventbrowser/evisimagedisplaywidget.cpp
-
- idtool/eviseventidtool.cpp
-
-)
-
-SET (evis_UIS
- ui/evisdatabaseconnectionguibase.ui
- ui/evisdatabaselayerfieldselectionguibase.ui
- ui/evisgenericeventbrowserguibase.ui
-)
-
-SET (evis_MOC_HDRS
- evis.h
-
- databaseconnection/evisdatabaseconnectiongui.h
- databaseconnection/evisdatabaselayerfieldselectiongui.h
-
- eventbrowser/evisgenericeventbrowsergui.h
- eventbrowser/evisimagedisplaywidget.h
-)
-
-SET (evis_RCCS resources/evis.qrc)
-
-SET (QT_USE_QT3SUPPORT FALSE)
-SET (QT_USE_QTGUI TRUE)
-SET (QT_USE_QTSQL TRUE)
-SET (QT_USE_QTSVG TRUE)
-SET (QT_USE_QTXML TRUE)
-SET (QT_USE_QTNETWORK TRUE)
-FIND_PACKAGE(Qt4 REQUIRED)
-INCLUDE( ${QT_USE_FILE} )
-########################################################
-# Build
-
-QT4_WRAP_UI (evis_UIS_H ${evis_UIS})
-
-QT4_WRAP_CPP (evis_MOC_SRCS ${evis_MOC_HDRS})
-
-QT4_ADD_RESOURCES(evis_RCC_SRCS ${evis_RCCS})
-
-ADD_LIBRARY (evis MODULE ${evis_SRCS} ${evis_MOC_SRCS} ${evis_RCC_SRCS} ${evis_UIS_H})
-
-INCLUDE_DIRECTORIES(
- ${GDAL_INCLUDE_DIR}
- ${GEOS_INCLUDE_DIR}
- ${QT_INCLUDE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/databaseconnection
- ${CMAKE_CURRENT_SOURCE_DIR}/eventbrowser
- ${CMAKE_CURRENT_SOURCE_DIR}/idtool
- ${CMAKE_CURRENT_SOURCE_DIR}/../../gui
- ${CMAKE_CURRENT_SOURCE_DIR}/../../core
- ${CMAKE_CURRENT_SOURCE_DIR}/../../core/raster
- ${CMAKE_CURRENT_SOURCE_DIR}/..
-)
-
-TARGET_LINK_LIBRARIES(evis
- ${QT_LIBRARIES}
- qgis_core
- qgis_gui
-)
-
-
-########################################################
-# Install
-
-INSTALL(TARGETS evis
- RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
- LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
+IF (WIN32)
+ IF (MSVC)
+ ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
+ ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
+ ELSE (MSVC)
+ ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
+ ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
+ ENDIF (MSVC)
+ELSE (WIN32)
+ ADD_DEFINITIONS(-DGUI_EXPORT=)
+ ADD_DEFINITIONS(-DCORE_EXPORT=)
+ENDIF (WIN32)
+
+########################################################
+# Files
+
+SET (evis_SRCS
+ evis.cpp
+
+ databaseconnection/evisdatabaseconnectiongui.cpp
+ databaseconnection/evisdatabaseconnection.cpp
+ databaseconnection/evisdatabaselayerfieldselectiongui.cpp
+ databaseconnection/evisquerydefinition.cpp
+
+ eventbrowser/evisconfiguration.cpp
+ eventbrowser/evisgenericeventbrowsergui.cpp
+ eventbrowser/evisimagedisplaywidget.cpp
+
+ idtool/eviseventidtool.cpp
+
+)
+
+SET (evis_UIS
+ ui/evisdatabaseconnectionguibase.ui
+ ui/evisdatabaselayerfieldselectionguibase.ui
+ ui/evisgenericeventbrowserguibase.ui
+)
+
+SET (evis_MOC_HDRS
+ evis.h
+
+ databaseconnection/evisdatabaseconnectiongui.h
+ databaseconnection/evisdatabaselayerfieldselectiongui.h
+
+ eventbrowser/evisgenericeventbrowsergui.h
+ eventbrowser/evisimagedisplaywidget.h
+)
+
+SET (evis_RCCS resources/evis.qrc)
+
+SET (QT_USE_QT3SUPPORT FALSE)
+SET (QT_USE_QTGUI TRUE)
+SET (QT_USE_QTSQL TRUE)
+SET (QT_USE_QTSVG TRUE)
+SET (QT_USE_QTXML TRUE)
+SET (QT_USE_QTNETWORK TRUE)
+FIND_PACKAGE(Qt4 REQUIRED)
+INCLUDE( ${QT_USE_FILE} )
+########################################################
+# Build
+
+QT4_WRAP_UI (evis_UIS_H ${evis_UIS})
+
+QT4_WRAP_CPP (evis_MOC_SRCS ${evis_MOC_HDRS})
+
+QT4_ADD_RESOURCES(evis_RCC_SRCS ${evis_RCCS})
+
+ADD_LIBRARY (evis MODULE ${evis_SRCS} ${evis_MOC_SRCS} ${evis_RCC_SRCS} ${evis_UIS_H})
+
+INCLUDE_DIRECTORIES(
+ ${GDAL_INCLUDE_DIR}
+ ${GEOS_INCLUDE_DIR}
+ ${QT_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/databaseconnection
+ ${CMAKE_CURRENT_SOURCE_DIR}/eventbrowser
+ ${CMAKE_CURRENT_SOURCE_DIR}/idtool
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../gui
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../core
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../core/raster
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+
+TARGET_LINK_LIBRARIES(evis
+ ${QT_LIBRARIES}
+ qgis_core
+ qgis_gui
+)
+
+
+########################################################
+# Install
+
+INSTALL(TARGETS evis
+ RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
+ LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
Modified: trunk/qgis/src/providers/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/CMakeLists.txt 2009-09-13 10:48:15 UTC (rev 11649)
+++ trunk/qgis/src/providers/CMakeLists.txt 2009-09-13 10:49:37 UTC (rev 11650)
@@ -1,18 +1,18 @@
-
-SUBDIRS (memory ogr wms delimitedtext osm)
-
-IF (POSTGRES_FOUND)
- SUBDIRS (postgres)
-ENDIF (POSTGRES_FOUND)
-
-IF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
- SUBDIRS (spatialite)
-ENDIF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
-
-IF (EXPAT_FOUND)
- SUBDIRS (gpx wfs)
-ENDIF (EXPAT_FOUND)
-
-IF (GRASS_FOUND)
- SUBDIRS (grass)
-ENDIF (GRASS_FOUND)
+
+SUBDIRS (memory ogr wms delimitedtext osm)
+
+IF (POSTGRES_FOUND)
+ SUBDIRS (postgres)
+ENDIF (POSTGRES_FOUND)
+
+IF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
+ SUBDIRS (spatialite)
+ENDIF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
+
+IF (EXPAT_FOUND)
+ SUBDIRS (gpx wfs)
+ENDIF (EXPAT_FOUND)
+
+IF (GRASS_FOUND)
+ SUBDIRS (grass)
+ENDIF (GRASS_FOUND)
More information about the QGIS-commit
mailing list