[Greater-commits] r192 - trunk/Administration

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-06-10 11:46:23 +0200 (Fri, 10 Jun 2011)
New Revision: 192

Modified:
   trunk/Administration/CMakeLists.txt
Log:
Fix msvc build / linking


Modified: trunk/Administration/CMakeLists.txt
===================================================================
--- trunk/Administration/CMakeLists.txt	2011-06-09 17:03:12 UTC (rev 191)
+++ trunk/Administration/CMakeLists.txt	2011-06-10 09:46:23 UTC (rev 192)
@@ -40,7 +40,7 @@
 
 SET(wxWidgets_USE_UNICODE False)
 # We need the Find package for wxWidgets to work
-FIND_PACKAGE(wxWidgets 2.8.0 REQUIRED)
+FIND_PACKAGE(wxWidgets 2.8.0 REQUIRED adv core base)
 FIND_PACKAGE(XercesC 2.8.0 REQUIRED)
 FIND_PACKAGE(Dagreater_pg REQUIRED)
 
@@ -98,4 +98,9 @@
 ENDIF(WIN32)
 
 add_executable(Administration WIN32 ${greateradmin_BIN_SRCS})
-target_link_libraries(Administration ecpg pq ${DAGREATER_PG_LIBRARY} ${wxWidgets_LIBRARIES} ${XERCESC_LIBRARY})
+target_link_libraries(Administration ${DAGREATER_PG_LIBRARY} ${wxWidgets_LIBRARIES} ${XERCESC_LIBRARY})
+if(MSVC)
+# Workaround for using differently compiled libs
+    set_target_properties(Administration PROPERTIES LINK_FLAGS /NODEFAULTLIB:libcmt)
+    set_target_properties(Administration PROPERTIES LINK_FLAGS /NODEFAULTLIB:libcmtd)
+endif(MSVC)