X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FCMakeLists.txt;h=e1726ca506616a4d427fcf096c58dc212fc1c1db;hb=55c9a4558cec9e3e781a0e0bc66f9d0bf418a611;hp=ad741d302d83c67fe65adae20fc93ff949e96e45;hpb=73c02c2103a34ec5d2ac48a345757dee0e0d42f9;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/CMakeLists.txt b/src/GeomAPI/CMakeLists.txt
index ad741d302..e1726ca50 100644
--- a/src/GeomAPI/CMakeLists.txt
+++ b/src/GeomAPI/CMakeLists.txt
@@ -1,11 +1,14 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 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
@@ -14,11 +17,24 @@ SET(PROJECT_HEADERS
     GeomAPI_Lin.h
     GeomAPI_Lin2d.h
     GeomAPI_Dir.h
+    GeomAPI_Dir2d.h
     GeomAPI_Pln.h
     GeomAPI_Shape.h
+    GeomAPI_Edge.h
+    GeomAPI_Face.h
+    GeomAPI_PlanarEdges.h
+    GeomAPI_AISObject.h
+    GeomAPI_IPresentable.h
+    GeomAPI_Curve.h 
+    GeomAPI_DataMapOfShapeShape.h
+    GeomAPI_ICustomPrs.h
+    GeomAPI_Vertex.h
+	GeomAPI_Ax3.h
 )
 
 SET(PROJECT_SOURCES
+    GeomAPI_Circ.cpp
+    GeomAPI_Circ2d.cpp
     GeomAPI_Interface.cpp
     GeomAPI_XY.cpp
     GeomAPI_XYZ.cpp
@@ -27,14 +43,32 @@ SET(PROJECT_SOURCES
     GeomAPI_Lin.cpp
     GeomAPI_Lin2d.cpp
     GeomAPI_Dir.cpp
+    GeomAPI_Dir2d.cpp
     GeomAPI_Pln.cpp
     GeomAPI_Shape.cpp
+    GeomAPI_Edge.cpp
+    GeomAPI_Face.cpp
+    GeomAPI_PlanarEdges.cpp
+    GeomAPI_AISObject.cpp
+    GeomAPI_Curve.cpp
+    GeomAPI_DataMapOfShapeShape.cpp
+    GeomAPI_Vertex.cpp
+    GeomAPI_ICustomPrs.cpp
+	GeomAPI_Ax3.cpp
+)
+
+SET(PROJECT_LIBRARIES
+    ${CAS_KERNEL} 
+    ${CAS_MODELER} 
+    ${CAS_VIEWER}
+    ${CAS_SHAPE}
+    ${CAS_TKTopAlgo}
 )
 
 ADD_DEFINITIONS(-DGEOMAPI_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(GeomAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 
-SET(CMAKE_SWIG_FLAGS "")
+SET(CMAKE_SWIG_FLAGS -threads -Wall)
 
 SET_SOURCE_FILES_PROPERTIES(GeomAPI.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(GeomAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
@@ -43,7 +77,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