X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=1127806c7f87aa6b3fd8c65d7dd8b8f4713bc0ae;hb=da6ada6975c41128a1890eade5127e700420390b;hp=696f724c2a829081ada55e42218fb5bf1f148d65;hpb=83c4f9d21db70830d40da2a6d7d7ff66a697edf8;p=modules%2Fshaper.git diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index 696f724c2..1127806c7 100644 --- a/src/ModelAPI/CMakeLists.txt +++ b/src/ModelAPI/CMakeLists.txt @@ -12,6 +12,7 @@ SET(PROJECT_HEADERS ModelAPI_AttributeIntArray.h ModelAPI_AttributeDocRef.h ModelAPI_AttributeDouble.h + ModelAPI_AttributeDoubleArray.h ModelAPI_AttributeInteger.h ModelAPI_AttributeRefAttr.h ModelAPI_AttributeReference.h @@ -50,6 +51,7 @@ SET(PROJECT_SOURCES ModelAPI_AttributeIntArray.cpp ModelAPI_AttributeDocRef.cpp ModelAPI_AttributeDouble.cpp + ModelAPI_AttributeDoubleArray.cpp ModelAPI_AttributeInteger.cpp ModelAPI_AttributeRefAttr.cpp ModelAPI_AttributeReference.cpp @@ -90,7 +92,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 @@ -120,11 +122,15 @@ 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 - Test1064.py) + Test1064.py + TestResults.py + TestIntArray.py + Test1512.py + TestDoubleArray.py)