X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionAPI%2FCMakeLists.txt;h=edf38ae48c2e0bcdf829cca7d6e7d3c391467587;hb=21a0c85b52bb93f94680e2342370764e6510e387;hp=6242dd18c910d189ed567fed1ef3950fe2a4d4b8;hpb=4f62ebbe5e87ffa4649a05690cdbaaade688deda;p=modules%2Fshaper.git

diff --git a/src/ConstructionAPI/CMakeLists.txt b/src/ConstructionAPI/CMakeLists.txt
index 6242dd18c..edf38ae48 100644
--- a/src/ConstructionAPI/CMakeLists.txt
+++ b/src/ConstructionAPI/CMakeLists.txt
@@ -1,46 +1,53 @@
 ## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
 INCLUDE(Common)
-INCLUDE(UnitTest)
-
-FIND_PACKAGE(SWIG REQUIRED)
-INCLUDE(${SWIG_USE_FILE})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
 
 SET(PROJECT_HEADERS
-    ConstructionAPI.h
-    ConstructionAPI_Point.h
+  ConstructionAPI.h
+  ConstructionAPI_Axis.h
+  ConstructionAPI_Plane.h
+  ConstructionAPI_Point.h
 )
 
 SET(PROJECT_SOURCES
-    ConstructionAPI_Point.cpp
+  ConstructionAPI_Axis.cpp
+  ConstructionAPI_Plane.cpp
+  ConstructionAPI_Point.cpp
 )
 
 SET(PROJECT_LIBRARIES
-    ModelAPI
-    ModelHighAPI
+  ModelAPI
+  ModelHighAPI
 )
 
-ADD_DEFINITIONS(-DCONSTRUCTIONAPI_EXPORTS ${CAS_DEFINITIONS})
-ADD_LIBRARY(ConstructionAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-
-SET(CMAKE_SWIG_FLAGS "-Wall")
-
-SET_SOURCE_FILES_PROPERTIES(ConstructionAPI.i PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(ConstructionAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
-
 INCLUDE_DIRECTORIES(
+  ${PROJECT_SOURCE_DIR}/src/Events
   ${PROJECT_SOURCE_DIR}/src/ModelAPI
   ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
 )
 
+# Plugin headers dependency
+INCLUDE_DIRECTORIES(
+  # TODO(spo): modify ConstructionPlugin headers to remove dependency on GeomAPI headers
+  ${PROJECT_SOURCE_DIR}/src/GeomAPI
+  # TODO(spo): it is for *_swig.h files. Can we eliminate it?
+  ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
+  ${PROJECT_SOURCE_DIR}/src/ConstructionPlugin
+)
+
+#TODO(spo): is ${CAS_DEFINITIONS} necessary?
+ADD_DEFINITIONS(-DCONSTRUCTIONAPI_EXPORTS ${CAS_DEFINITIONS})
+ADD_LIBRARY(ConstructionAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 TARGET_LINK_LIBRARIES(ConstructionAPI ${PROJECT_LIBRARIES})
 
-SET(SWIG_SCRIPTS
-  ${CMAKE_CURRENT_BINARY_DIR}/ConstructionAPI.py
-)
+# SWIG wrapper
+
+INCLUDE(PythonAPI)
+
+SET_SOURCE_FILES_PROPERTIES(ConstructionAPI.i PROPERTIES CPLUSPLUS ON)
+SET_SOURCE_FILES_PROPERTIES(ConstructionAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
 
+#TODO(spo): is ModelAPI necessary or it could be received by INTERFACE_ (may require modern CMake)?
 SET(SWIG_LINK_LIBRARIES
   ConstructionAPI
   ModelHighAPI
@@ -49,7 +56,10 @@ SET(SWIG_LINK_LIBRARIES
 )
 
 SET(SWIG_MODULE_ConstructionAPI_EXTRA_DEPS ${SWIG_MODULE_ConstructionAPI_EXTRA_DEPS}
-    ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i)
+  ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i
+  doxyhelp.i
+  ${PROJECT_HEADERS}
+)
 
 SWIG_ADD_MODULE(ConstructionAPI python ConstructionAPI.i ${PROJECT_HEADERS})
 SWIG_LINK_LIBRARIES(ConstructionAPI ${SWIG_LINK_LIBRARIES})
@@ -60,10 +70,13 @@ ENDIF(WIN32)
 
 INSTALL(TARGETS _ConstructionAPI DESTINATION ${SHAPER_INSTALL_SWIG})
 INSTALL(TARGETS ConstructionAPI DESTINATION ${SHAPER_INSTALL_BIN})
-INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ConstructionAPI.py DESTINATION ${SHAPER_INSTALL_SWIG})
 
-ADD_UNIT_TESTS(
-    TestPoint.py
-    )
+# Tests
 
-ADD_SUBDIRECTORY (Test)
+INCLUDE(UnitTest)
+
+ADD_UNIT_TESTS(
+  TestPoint.py
+  TestAxis.py
+)