X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FCMakeLists.txt;h=3332171b0ca1317d620fe2ad888a292deb926806;hb=29bc47d2f0f38f132e4f578feec9a1d1c8e514fe;hp=15162678616da2275f604cd114e5b2c174ecfe3d;hpb=84c21dd48f2b4be389dfa4042bc8084589c5e521;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/CMakeLists.txt b/src/GeomAPI/CMakeLists.txt
index 151626786..3332171b0 100644
--- a/src/GeomAPI/CMakeLists.txt
+++ b/src/GeomAPI/CMakeLists.txt
@@ -1,28 +1,92 @@
+## 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
     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_ShapeExplorer.h
+    GeomAPI_ShapeIterator.h
+    GeomAPI_Edge.h
+    GeomAPI_Face.h
+    GeomAPI_PlanarEdges.h
+    GeomAPI_AISObject.h
+    GeomAPI_IPresentable.h
+    GeomAPI_Curve.h
+    GeomAPI_DataMapOfShapeMapOfShapes.h
+    GeomAPI_DataMapOfShapeShape.h
+    GeomAPI_ICustomPrs.h
+    GeomAPI_Vertex.h
+    GeomAPI_Ax1.h
+    GeomAPI_Ax2.h
+    GeomAPI_Ax3.h
+    GeomAPI_Trsf.h
+    GeomAPI_Angle2d.h
+    GeomAPI_Wire.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_ShapeExplorer.cpp
+    GeomAPI_ShapeIterator.cpp
+    GeomAPI_Edge.cpp
+    GeomAPI_Face.cpp
+    GeomAPI_PlanarEdges.cpp
+    GeomAPI_AISObject.cpp
+    GeomAPI_Curve.cpp
+    GeomAPI_DataMapOfShapeMapOfShapes.cpp
+    GeomAPI_DataMapOfShapeShape.cpp
+    GeomAPI_Vertex.cpp
+    GeomAPI_ICustomPrs.cpp
+    GeomAPI_Ax1.cpp
+    GeomAPI_Ax2.cpp
+    GeomAPI_Ax3.cpp
+    GeomAPI_IPresentable.cpp
+    GeomAPI_Trsf.cpp
+    GeomAPI_Angle2d.cpp
+    GeomAPI_Wire.cpp
+)
+
+SET(PROJECT_LIBRARIES
+    ${CAS_KERNEL}
+    ${CAS_MODELER}
+    ${CAS_VIEWER}
+    ${CAS_SHAPE}
+    ${CAS_TKTopAlgo}
+    ${CAS_TKBO}
 )
 
 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")
@@ -31,7 +95,7 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
 )
 
-TARGET_LINK_LIBRARIES(GeomAPI ${PROJECT_LIBRARIES} ${CAS_KERNEL})
+TARGET_LINK_LIBRARIES(GeomAPI ${PROJECT_LIBRARIES})
 
 SET(SWIG_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/GeomAPI.py
@@ -49,6 +113,6 @@ IF(WIN32)
   SET_TARGET_PROPERTIES(_GeomAPI PROPERTIES DEBUG_OUTPUT_NAME _GeomAPI_d)
 ENDIF(WIN32)
 
-INSTALL(TARGETS _GeomAPI DESTINATION swig)
-INSTALL(TARGETS GeomAPI DESTINATION bin)
-INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig)
+INSTALL(TARGETS _GeomAPI DESTINATION ${SHAPER_INSTALL_SWIG})
+INSTALL(TARGETS GeomAPI DESTINATION ${SHAPER_INSTALL_BIN})
+INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG})