[Jderobot-admin] jderobot-r962 - trunk/src/libs/geometry

[rocapal en jderobot.org]

Author: rocapal
Date: 2013-08-05 06:58:44 +0200 (Mon, 05 Aug 2013)
New Revision: 962

Modified:
   trunk/src/libs/geometry/CMakeLists.txt
Log:
[26] The output library is libgeometry.so (without shared)


Modified: trunk/src/libs/geometry/CMakeLists.txt
===================================================================
--- trunk/src/libs/geometry/CMakeLists.txt	2013-08-02 17:47:01 UTC (rev 961)
+++ trunk/src/libs/geometry/CMakeLists.txt	2013-08-05 04:58:44 UTC (rev 962)
@@ -4,16 +4,16 @@
  
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} /usr/include/libxml2/)
 
-set(SRC_FILES math/matriz3x3.cpp  math/matriz4x4.cpp  math/plano.cpp  math/utils.cpp  math/vector2d.cpp  math/vector3.cpp  math/vector2H.cpp math/vector3H.cpp math/Line2D.cpp math/Segment2D.cpp  math/Point2D.cpp math/Point3D.cpp collada/colladaparser.cpp collada/color.cpp collada/malla.cpp collada/material.cpp collada/submalla.cpp progeo/progeo2.cpp math/segmento.cpp math/recta.cpp) 
+set(SRC_FILES math/matriz3x3.cpp  math/matriz4x4.cpp  math/plano.cpp  math/utils.cpp  math/vector2d.cpp  math/vector3.cpp  math/vector2H.cpp math/vector3H.cpp math/Line2D.cpp math/Segment2D.cpp  math/Point2D.cpp math/Point3D.cpp collada/colladaparser.cpp collada/color.cpp collada/malla.cpp collada/material.cpp collada/submalla.cpp progeo/Progeo.cpp math/segmento.cpp math/recta.cpp) 
  
-ADD_LIBRARY(geometry_shared SHARED ${SRC_FILES})
+ADD_LIBRARY(geometry SHARED ${SRC_FILES})
 
 include(FindPkgConfig)
 find_package(Boost COMPONENTS system filesystem REQUIRED)
 
-target_link_libraries(geometry_shared tinyxml GLU opencv_core opencv_highgui ${Boost_LIBRARIES})
+target_link_libraries(geometry tinyxml GLU opencv_core opencv_highgui ${Boost_LIBRARIES})
 
-SET_PROPERTY(TARGET geometry_shared PROPERTY SOVERSION 1.0)
+SET_PROPERTY(TARGET geometry PROPERTY SOVERSION 1.0)
  
 #ADD_LIBRARY(geometry_static STATIC ${SRC_FILES})