[Jderobot-admin] jderobot-r872 - in trunk: Deps/xerces src/libs/progeo

[frivas en jderobot.org]

Author: frivas
Date: 2013-03-04 09:43:53 +0100 (Mon, 04 Mar 2013)
New Revision: 872

Modified:
   trunk/Deps/xerces/CMakeLists.txt
   trunk/src/libs/progeo/CMakeLists.txt
Log:
modifacadas las dependencias de progeo y las librer?\195?\173as con que linka


Modified: trunk/Deps/xerces/CMakeLists.txt
===================================================================
--- trunk/Deps/xerces/CMakeLists.txt	2013-03-03 18:23:33 UTC (rev 871)
+++ trunk/Deps/xerces/CMakeLists.txt	2013-03-04 08:43:53 UTC (rev 872)
@@ -1,7 +1,8 @@
 FIND_PATH( xerces_INCLUDE_DIR NAMES libxml/parser.h  PATHS ENV C++LIB ENV PATH PATH_SUFFIXES libxml2)
  
+message("-----------------------XERCES bla bla: ${xerces_INCLUDE_DIR}")
 IF( xerces_INCLUDE_DIR )
-    FIND_LIBRARY( xerces_LIBRARIES NAMES xerces-c PATHS ENV C++LIB ENV PATH PATH_SUFFIXES /usr/lib)
+    FIND_LIBRARY( xerces_LIBRARIES NAMES xml2  PATHS ENV C++LIB ENV PATH PATH_SUFFIXES /usr/lib)
     IF( xerces_LIBRARIES )
 		MESSAGE ("*** Xerces ok")
 		MESSAGE ("${xerces_INCLUDE_DIR}")
@@ -14,3 +15,5 @@
 		MESSAGE ("*** *** Xerces libraries: libxerces-c not found")
 ENDIF()
 
+message("-----------------------XERCES bla bla: ${xerces_LIBRARIES}")
+

Modified: trunk/src/libs/progeo/CMakeLists.txt
===================================================================
--- trunk/src/libs/progeo/CMakeLists.txt	2013-03-03 18:23:33 UTC (rev 871)
+++ trunk/src/libs/progeo/CMakeLists.txt	2013-03-04 08:43:53 UTC (rev 872)
@@ -3,3 +3,8 @@
 add_library (progeoshare SHARED progeo.c progeo.h)
 
 set_target_properties(progeoshare PROPERTIES OUTPUT_NAME progeo)
+
+TARGET_LINK_LIBRARIES(progeoshare ${gsl_LIBRARIES})
+TARGET_LINK_LIBRARIES(progeoshare ${xerces_LIBRARIES})
+
+message("---------progeo  ${gsl_LIBRARIES}")