Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 4b15c44e34edd1aac6898b0b12082c48547531e4..981d5567d82e4bda6a5dd79f327fd2762fa21217 100644
(file)
--- a/
src/ModelAPI/CMakeLists.txt
+++ b/
src/ModelAPI/CMakeLists.txt
@@
-1,5
+1,3
@@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
FIND_PACKAGE(SWIG REQUIRED)
INCLUDE(${SWIG_USE_FILE})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
FIND_PACKAGE(SWIG REQUIRED)
INCLUDE(${SWIG_USE_FILE})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@@
-9,22
+7,34
@@
SET(PROJECT_HEADERS
ModelAPI_PluginManager.h
ModelAPI_Plugin.h
ModelAPI_Feature.h
ModelAPI_PluginManager.h
ModelAPI_Plugin.h
ModelAPI_Feature.h
- ModelAPI_Iterator.h
ModelAPI_Data.h
ModelAPI_Data.h
+ ModelAPI_Object.h
ModelAPI_Document.h
ModelAPI_Attribute.h
ModelAPI_AttributeDouble.h
ModelAPI_AttributeDocRef.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
)
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)
)
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 "")
SET(CMAKE_SWIG_FLAGS "")
@@
-52,6
+62,4
@@
ENDIF(WIN32)
INSTALL(TARGETS _ModelAPI DESTINATION swig)
INSTALL(TARGETS ModelAPI DESTINATION bin)
INSTALL(TARGETS _ModelAPI DESTINATION swig)
INSTALL(TARGETS ModelAPI DESTINATION bin)
-#INSTALL(TARGETS ${SWIG_SCRIPTS} DESTINATION swig)
-
-
+INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig)