[Greater-commits] r176 - trunk/GREAT-ER-DB/trunk/impl/postgresql

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-06-09 16:02:41 +0200 (Thu, 09 Jun 2011)
New Revision: 176

Modified:
   trunk/GREAT-ER-DB/trunk/impl/postgresql/CMakeLists.txt
Log:
Change options order for ecpg which is sensitive to their order on Windows


Modified: trunk/GREAT-ER-DB/trunk/impl/postgresql/CMakeLists.txt
===================================================================
--- trunk/GREAT-ER-DB/trunk/impl/postgresql/CMakeLists.txt	2011-06-09 10:57:29 UTC (rev 175)
+++ trunk/GREAT-ER-DB/trunk/impl/postgresql/CMakeLists.txt	2011-06-09 14:02:41 UTC (rev 176)
@@ -64,14 +64,14 @@
 
 ADD_CUSTOM_COMMAND(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dagreater_pg.c
-   COMMAND ${ECPG_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/dagreater_pg.pgc -o
-           ${CMAKE_CURRENT_BINARY_DIR}/dagreater_pg.c
+   COMMAND ${ECPG_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/dagreater_pg.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/dagreater_pg.pgc
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dagreater_pg.pgc
 )
 ADD_CUSTOM_COMMAND(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gdagreater_pg.c
-   COMMAND ${ECPG_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gdagreater_pg.pgc -o
-           ${CMAKE_CURRENT_BINARY_DIR}/gdagreater_pg.c
+   COMMAND ${ECPG_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/gdagreater_pg.c
+           ${CMAKE_CURRENT_SOURCE_DIR}/gdagreater_pg.pgc
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gdagreater_pg.pgc
 )
 
@@ -84,6 +84,7 @@
     DEFINE_SYMBOL DAGREATER_PG_MAKEDLL
 )
 
-install(TARGETS dagreater_pg
-        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(TARGETS dagreater_pg DESTINATION ${CMAKE_INSTALL_PREFIX}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)