X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGeomAPI%2FCMakeLists.txt;h=2718fa98007c81bd5db0b61caf66488bbcedebf1;hb=d22fc665c79c31c9eea0625e04c2e941adfdf7be;hp=cf21d319f0efbac8e85a7886ae2655c29c50daa2;hpb=8f2fef811ec343cd840bef38e56f3658178f442c;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/CMakeLists.txt b/src/GeomAPI/CMakeLists.txt
index cf21d319f..2718fa980 100644
--- a/src/GeomAPI/CMakeLists.txt
+++ b/src/GeomAPI/CMakeLists.txt
@@ -1,32 +1,58 @@
 FIND_PACKAGE(SWIG REQUIRED)
-INCLUDE(FindCAS)
 
 INCLUDE(${SWIG_USE_FILE})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(PROJECT_HEADERS
     GeomAPI.h
+    GeomAPI_Circ.h
+    GeomAPI_Circ2d.h
     GeomAPI_Interface.h
+    GeomAPI_XY.h
     GeomAPI_XYZ.h
     GeomAPI_Pnt.h
     GeomAPI_Pnt2d.h
     GeomAPI_Lin.h
     GeomAPI_Lin2d.h
     GeomAPI_Dir.h
+    GeomAPI_Dir2d.h
     GeomAPI_Pln.h
     GeomAPI_Shape.h
+    GeomAPI_Edge.h
+    GeomAPI_PlanarEdges.h
+    GeomAPI_AISObject.h
+    GeomAPI_IPresentable.h
+    GeomAPI_Curve.h 
+    GeomAPI_DataMapOfShapeShape.h
 )
 
 SET(PROJECT_SOURCES
+    GeomAPI_Circ.cpp
+    GeomAPI_Circ2d.cpp
     GeomAPI_Interface.cpp
+    GeomAPI_XY.cpp
     GeomAPI_XYZ.cpp
     GeomAPI_Pnt.cpp
     GeomAPI_Pnt2d.cpp
     GeomAPI_Lin.cpp
     GeomAPI_Lin2d.cpp
     GeomAPI_Dir.cpp
+    GeomAPI_Dir2d.cpp
     GeomAPI_Pln.cpp
     GeomAPI_Shape.cpp
+    GeomAPI_Edge.cpp
+    GeomAPI_PlanarEdges.cpp
+    GeomAPI_AISObject.cpp
+    GeomAPI_Curve.cpp
+    GeomAPI_DataMapOfShapeShape.cpp
+)
+
+SET(PROJECT_LIBRARIES
+    ${CAS_KERNEL} 
+    ${CAS_MODELER} 
+    ${CAS_VIEWER}
+    ${CAS_SHAPE}
+    ${CAS_TKTopAlgo}
 )
 
 ADD_DEFINITIONS(-DGEOMAPI_EXPORTS ${CAS_DEFINITIONS})
@@ -41,7 +67,7 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
 )
 
-TARGET_LINK_LIBRARIES(GeomAPI ${PROJECT_LIBRARIES} ${CAS_KERNEL} ${CAS_MODELER})
+TARGET_LINK_LIBRARIES(GeomAPI ${PROJECT_LIBRARIES})
 
 SET(SWIG_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/GeomAPI.py