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 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0
[modules/shaper.git]
/
src
/
ModelAPI
/
CMakeLists.txt
diff --git
a/src/ModelAPI/CMakeLists.txt
b/src/ModelAPI/CMakeLists.txt
index 738664c17187339a52195be27b47ecc5491339b3..2fb0d5ba437ce8c6d078ad9b279830cc499b3474 100644
(file)
--- a/
src/ModelAPI/CMakeLists.txt
+++ b/
src/ModelAPI/CMakeLists.txt
@@
-9,6
+9,7
@@
SET(PROJECT_HEADERS
ModelAPI.h
ModelAPI_Attribute.h
ModelAPI_AttributeBoolean.h
ModelAPI.h
ModelAPI_Attribute.h
ModelAPI_AttributeBoolean.h
+ ModelAPI_AttributeIntArray.h
ModelAPI_AttributeDocRef.h
ModelAPI_AttributeDouble.h
ModelAPI_AttributeInteger.h
ModelAPI_AttributeDocRef.h
ModelAPI_AttributeDouble.h
ModelAPI_AttributeInteger.h
@@
-27,22
+28,22
@@
SET(PROJECT_HEADERS
ModelAPI_FeatureValidator.h
ModelAPI_Object.h
ModelAPI_Plugin.h
ModelAPI_FeatureValidator.h
ModelAPI_Object.h
ModelAPI_Plugin.h
- ModelAPI_RefAttrValidator.h
ModelAPI_Result.h
ModelAPI_ResultBody.h
ModelAPI_ResultConstruction.h
ModelAPI_ResultGroup.h
ModelAPI_Result.h
ModelAPI_ResultBody.h
ModelAPI_ResultConstruction.h
ModelAPI_ResultGroup.h
- ModelAPI_ResultParameter
s
.h
+ ModelAPI_ResultParameter.h
ModelAPI_ResultPart.h
ModelAPI_ResultPart.h
- ModelAPI_ResultValidator.h
ModelAPI_Session.h
ModelAPI_Tools.h
ModelAPI_Session.h
ModelAPI_Tools.h
+ ModelAPI_ShapeValidator.h
ModelAPI_Validator.h
)
SET(PROJECT_SOURCES
ModelAPI_Attribute.cpp
ModelAPI_AttributeBoolean.cpp
ModelAPI_Validator.h
)
SET(PROJECT_SOURCES
ModelAPI_Attribute.cpp
ModelAPI_AttributeBoolean.cpp
+ ModelAPI_AttributeIntArray.cpp
ModelAPI_AttributeDocRef.cpp
ModelAPI_AttributeDouble.cpp
ModelAPI_AttributeInteger.cpp
ModelAPI_AttributeDocRef.cpp
ModelAPI_AttributeDouble.cpp
ModelAPI_AttributeInteger.cpp
@@
-64,8
+65,11
@@
SET(PROJECT_SOURCES
ModelAPI_ResultConstruction.cpp
ModelAPI_ResultGroup.cpp
ModelAPI_ResultPart.cpp
ModelAPI_ResultConstruction.cpp
ModelAPI_ResultGroup.cpp
ModelAPI_ResultPart.cpp
+ ModelAPI_ResultParameter.cpp
ModelAPI_Session.cpp
ModelAPI_Session.cpp
+ ModelAPI_ShapeValidator.cpp
ModelAPI_Tools.cpp
ModelAPI_Tools.cpp
+ ModelAPI_AttributeValidator.cpp
)
SET(PROJECT_LIBRARIES
)
SET(PROJECT_LIBRARIES
@@
-78,11
+82,10
@@
ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
SET_TARGET_PROPERTIES(ModelAPI PROPERTIES LINKER_LANGUAGE CXX)
TARGET_LINK_LIBRARIES(ModelAPI ${PROJECT_LIBRARIES})
SET_TARGET_PROPERTIES(ModelAPI PROPERTIES LINKER_LANGUAGE CXX)
TARGET_LINK_LIBRARIES(ModelAPI ${PROJECT_LIBRARIES})
-INCLUDE_DIRECTORIES(
- ../Config
- ../Events
- ../GeomAPI
- ../GeomAlgoAPI
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config
+ ${PROJECT_SOURCE_DIR}/src/Events
+ ${PROJECT_SOURCE_DIR}/src/GeomAPI
+ ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
)
)