Merge branch 'master' of newgeom:newgeom

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

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index c81c020afb12fd92dd0a2d2549d41aec766aeb33..981d5567d82e4bda6a5dd79f327fd2762fa21217 100644 (file)
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -1,33 +1,40 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
-INCLUDE(Common)
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
-INCLUDE(FindPython)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(PROJECT_HEADERS
     ModelAPI.h
-    ModelAPI_Interface.h
     ModelAPI_PluginManager.h
     ModelAPI_Plugin.h
     ModelAPI_Feature.h
-    ModelAPI_Iterator.h
+    ModelAPI_Data.h
     ModelAPI_Object.h
     ModelAPI_Document.h
     ModelAPI_Attribute.h
     ModelAPI_AttributeDouble.h
     ModelAPI_AttributeDocRef.h
+    ModelAPI_AttributeReference.h
+    ModelAPI_AttributeRefAttr.h
+    ModelAPI_AttributeRefList.h
+    ModelAPI_AttributeBoolean.h
 )
 
 SET(PROJECT_SOURCES
-    ModelAPI_PluginManager.cxx
+    ModelAPI_PluginManager.cpp
+)
+
+SET(PROJECT_LIBRARIES
+    Config
 )
 
 ADD_DEFINITIONS(-DMODELAPI_EXPORTS)
 ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 SET_TARGET_PROPERTIES(ModelAPI PROPERTIES LINKER_LANGUAGE CXX)
-#TARGET_LINK_LIBRARIES(ModelAPI ${PROJECT_LIBRARIES})
+TARGET_LINK_LIBRARIES(ModelAPI ${PROJECT_LIBRARIES})
+
+INCLUDE_DIRECTORIES(
+  ../Config
+)
 
 SET(CMAKE_SWIG_FLAGS "")
 
@@ -54,6 +61,5 @@ IF(WIN32)
 ENDIF(WIN32)
 
 INSTALL(TARGETS _ModelAPI DESTINATION swig)
-#INSTALL(TARGETS ${SWIG_SCRIPTS} DESTINATION swig)
-
-
+INSTALL(TARGETS ModelAPI DESTINATION bin)
+INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig)