Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

[modules/shaper.git] / src / GeomAPI / CMakeLists.txt

diff --git a/src/GeomAPI/CMakeLists.txt b/src/GeomAPI/CMakeLists.txt
index 28187984c9d8037f1535e21b1b173a1682d65098..e1726ca506616a4d427fcf096c58dc212fc1c1db 100644 (file)
--- a/src/GeomAPI/CMakeLists.txt
+++ b/src/GeomAPI/CMakeLists.txt
@@ -1,3 +1,5 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 FIND_PACKAGE(SWIG REQUIRED)
 
 INCLUDE(${SWIG_USE_FILE})
@@ -18,6 +20,16 @@ SET(PROJECT_HEADERS
     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
@@ -34,12 +46,29 @@ SET(PROJECT_SOURCES
     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")
@@ -48,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