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

[rocapal en jderobot.org]

Author: rocapal
Date: 2013-08-01 12:42:10 +0200 (Thu, 01 Aug 2013)
New Revision: 957

Modified:
   trunk/src/libs/geometry/CMakeLists.txt
Log:
[26] added link libraries and added cpp files to compilation process


Modified: trunk/src/libs/geometry/CMakeLists.txt
===================================================================
--- trunk/src/libs/geometry/CMakeLists.txt	2013-08-01 10:39:51 UTC (rev 956)
+++ trunk/src/libs/geometry/CMakeLists.txt	2013-08-01 10:42:10 UTC (rev 957)
@@ -2,16 +2,19 @@
  
 PROJECT(libgeometry)
  
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} /usr/include/libxml2/)
  
-ADD_LIBRARY(geometry_shared SHARED math/matriz3x3.cpp math/matriz4x4.cpp math/utils.cpp math/vector2d.cpp math/vector3.cpp
-                                math/segmento.cpp math/recta.cpp math/plano.cpp
-                                collada/colladaparser.cpp collada/color.cpp collada/malla.cpp collada/material.cpp collada/submalla.cpp)
+ADD_LIBRARY(geometry_shared SHARED math/matriz3x3.cpp  math/matriz4x4.cpp  math/plano.cpp  math/recta.cpp  
+				   math/segmento.cpp  math/utils.cpp  math/vector2d.cpp  math/vector2H.cpp  math/vector3.cpp  math/vector3H.cpp 
+                                   collada/colladaparser.cpp collada/color.cpp collada/malla.cpp collada/material.cpp collada/submalla.cpp progeo/progeo.cpp)
 
+target_link_libraries(geometry_shared tinyxml GLU )
+
 SET_PROPERTY(TARGET geometry_shared PROPERTY SOVERSION 1.0)
  
-ADD_LIBRARY(geometry_static STATIC math/matriz3x3.cpp math/matriz4x4.cpp math/utils.cpp math/vector2d.cpp math/vector3.cpp
-                                math/segmento.cpp math/recta.cpp math/plano.cpp
-                                collada/colladaparser.cpp collada/color.cpp collada/malla.cpp collada/material.cpp collada/submalla.cpp)
- 
+ADD_LIBRARY(geometry_static STATIC math/matriz3x3.cpp  math/matriz4x4.cpp  math/plano.cpp  math/recta.cpp  
+                                   math/segmento.cpp  math/utils.cpp  math/vector2d.cpp  math/vector2H.cpp  math/vector3.cpp  math/vector3H.cpp 
+                                   collada/colladaparser.cpp collada/color.cpp collada/malla.cpp collada/material.cpp collada/submalla.cpp progeo/progeo.cpp)
+
+target_link_libraries(geometry_shared tinyxml GLU ) 
 SET_TARGET_PROPERTIES(geometry_shared geometry_static PROPERTIES OUTPUT_NAME geometry)