[Greater-commits] r12 - in trunk/Administration: . cmake

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-06-08 17:53:23 +0200 (Wed, 08 Jun 2011)
New Revision: 12

Modified:
   trunk/Administration/CMakeLists.txt
   trunk/Administration/cmake/FindDagreater_pg.cmake
Log:
Fix dagreater include/link and cmake module


Modified: trunk/Administration/CMakeLists.txt
===================================================================
--- trunk/Administration/CMakeLists.txt	2011-06-08 10:29:41 UTC (rev 11)
+++ trunk/Administration/CMakeLists.txt	2011-06-08 15:53:23 UTC (rev 12)
@@ -18,13 +18,14 @@
 SET(wxWidgets_USE_UNICODE False)
 # We need the Find package for wxWidgets to work
 FIND_PACKAGE(wxWidgets 2.8.0 REQUIRED)
-FIND_PACKAGE(XercesC 3.0.0 REQUIRED)
+FIND_PACKAGE(XercesC 2.8.0 REQUIRED)
+FIND_PACKAGE(Dagreater_pg REQUIRED)
 
 include( ${wxWidgets_USE_FILE} )
 
 add_definitions(-DwxUSE_UNICODE=0)
 add_definitions(-Werror)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}, ${wxWidgets_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}, ${wxWidgets_INCLUDE_DIRS}, ${DAGREATER_PG_INCLUDE})
 
 set( greateradmin_BIN_SRCS
   Administration.cpp
@@ -72,4 +73,4 @@
 ENDIF(WIN32)
 
 add_executable(Administration WIN32 ${greateradmin_BIN_SRCS})
-target_link_libraries(Administration ${wxWidgets_LIBRARIES} ${XERCESC_LIBRARY})
+target_link_libraries(Administration ecpg pq ${DAGREATER_PG_LIBRARY} ${wxWidgets_LIBRARIES} ${XERCESC_LIBRARY})

Modified: trunk/Administration/cmake/FindDagreater_pg.cmake
===================================================================
--- trunk/Administration/cmake/FindDagreater_pg.cmake	2011-06-08 10:29:41 UTC (rev 11)
+++ trunk/Administration/cmake/FindDagreater_pg.cmake	2011-06-08 15:53:23 UTC (rev 12)
@@ -8,7 +8,7 @@
 IF (DAGREATER_PG_INCLUDE AND DAGREATER_PG_LIBRARY)
 # in cache already
 SET(DAGREATER_PG_FIND_QUIETLY TRUE)
-ENDIF (_INCLUDE AND DAGREATER_PG_LIBRARY)
+ENDIF (DAGREATER_PG_INCLUDE AND DAGREATER_PG_LIBRARY)
 
 FIND_PATH(DAGREATER_PG_INCLUDE NAMES datypes_pg.h daimplib_pg.h
 PATHS
@@ -18,7 +18,6 @@
  /usr/include
 )
 
-IF (DAGREATER_PG_STATIC)
 FIND_LIBRARY(DAGREATER_PG_LIBRARY NAMES libdagreater_pg _dagreater_pg dagreater_pg
  PATHS
  $ENV{DAGREATER_PG_LIBRARY_DIR}
@@ -26,7 +25,8 @@
  /usr/lib
  /usr/local/lib
 )
-
+MESSAGE(STATUS "lib is ${DAGREATER_PG_LIBRARY}")
+MESSAGE(STATUS "inc is ${DAGREATER_PG_INCLUDE}")
 IF (DAGREATER_PG_INCLUDE AND DAGREATER_PG_LIBRARY)
 SET(DAGREATER_PG_FOUND TRUE)
 ELSE (DAGREATER_PG_INCLUDE AND DAGREATER_PG_LIBRARY)
@@ -35,9 +35,10 @@
 
 IF(DAGREATER_PG_FOUND)
 
-IF(NOT DAGREATER_PG_FIND_QUIETLY)
- MESSAGE(STATUS "Found dagreater_pg: ${DAGREATER_PG_LIBRARY}")
-ENDIF(NOT DAGREATER_PG_FIND_QUIETLY)
+ IF(NOT DAGREATER_PG_FIND_QUIETLY)
+  MESSAGE(STATUS "Found dagreater_pg: ${DAGREATER_PG_LIBRARY}")
+ ENDIF(NOT DAGREATER_PG_FIND_QUIETLY)
+
 ELSE(DAGREATER_PG_FOUND)
 MESSAGE(FATAL_ERROR "Could not find deagreater_pg !")
 ENDIF(DAGREATER_PG_FOUND)