X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=fb4db8b550eb191cf4f1048d788f4bba1e1af3e9;hb=1cef78af4c4328ecf99a3ced86bda38e6e82e15c;hp=70d61ff25bb1b41c58448213e14dfdc541c8c97a;hpb=e98f5ede19029ac09ae9fe78061a4485bd6b86b5;p=modules%2Fshaper.git diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index 70d61ff25..fb4db8b55 100644 --- a/src/ModelAPI/CMakeLists.txt +++ b/src/ModelAPI/CMakeLists.txt @@ -15,6 +15,7 @@ SET(PROJECT_HEADERS ModelAPI_AttributeInteger.h ModelAPI_AttributeRefAttr.h ModelAPI_AttributeReference.h + ModelAPI_AttributeRefAttrList.h ModelAPI_AttributeRefList.h ModelAPI_AttributeSelection.h ModelAPI_AttributeSelectionList.h @@ -40,7 +41,7 @@ SET(PROJECT_HEADERS ModelAPI_Session.h ModelAPI_Tools.h ModelAPI_Validator.h - ModelAPI_Entity.h + ModelAPI_Entity.h ) SET(PROJECT_SOURCES @@ -52,6 +53,7 @@ SET(PROJECT_SOURCES ModelAPI_AttributeInteger.cpp ModelAPI_AttributeRefAttr.cpp ModelAPI_AttributeReference.cpp + ModelAPI_AttributeRefAttrList.cpp ModelAPI_AttributeRefList.cpp ModelAPI_AttributeSelection.cpp ModelAPI_AttributeSelectionList.cpp @@ -88,7 +90,7 @@ ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) SET_TARGET_PROPERTIES(ModelAPI PROPERTIES LINKER_LANGUAGE CXX) TARGET_LINK_LIBRARIES(ModelAPI ${PROJECT_LIBRARIES}) -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config ${PROJECT_SOURCE_DIR}/src/Events ${PROJECT_SOURCE_DIR}/src/GeomAPI ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI @@ -107,7 +109,7 @@ SET(SWIG_SCRIPTS SET(SWIG_LINK_LIBRARIES ModelAPI - GeomAPI + GeomAPI ${PYTHON_LIBRARIES} ) @@ -118,10 +120,11 @@ IF(WIN32) SET_TARGET_PROPERTIES(_ModelAPI PROPERTIES DEBUG_OUTPUT_NAME _ModelAPI_d) ENDIF(WIN32) -INSTALL(TARGETS _ModelAPI DESTINATION swig) -INSTALL(TARGETS ModelAPI DESTINATION bin) -INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig) +INSTALL(TARGETS _ModelAPI DESTINATION ${SHAPER_INSTALL_SWIG}) +INSTALL(TARGETS ModelAPI DESTINATION ${SHAPER_INSTALL_BIN}) +INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG}) ADD_UNIT_TESTS(TestConstants.py TestUndoRedo.py - TestDocument.py) + TestDocument.py + Test1064.py)