From: spo Date: Mon, 11 Jan 2016 10:46:45 +0000 (+0300) Subject: Prepare CMakeLists.txt files to use for OpenParts X-Git-Tag: V_2.2.0~225 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=330606d6e8666ed5228d2df26d5306068d50d5d6;p=modules%2Fshaper.git Prepare CMakeLists.txt files to use for OpenParts --- diff --git a/src/GeomValidators/CMakeLists.txt b/src/GeomValidators/CMakeLists.txt index 4ac409c81..aa2d4a021 100644 --- a/src/GeomValidators/CMakeLists.txt +++ b/src/GeomValidators/CMakeLists.txt @@ -41,18 +41,17 @@ SET(PROJECT_LIBRARIES GeomAPI ) - - ADD_DEFINITIONS(-DGEOMVALIDATORS_EXPORTS ${CAS_DEFINITIONS}) ADD_LIBRARY(GeomValidators SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) TARGET_LINK_LIBRARIES(GeomValidators ${PROJECT_LIBRARIES}) INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR}/src/ModelAPI - ${CMAKE_SOURCE_DIR}/src/Events - ${CMAKE_SOURCE_DIR}/src/GeomAPI - ${CMAKE_SOURCE_DIR}/src/GeomDataAPI + ${PROJECT_SOURCE_DIR}/src/ModelAPI + ${PROJECT_SOURCE_DIR}/src/Events + ${PROJECT_SOURCE_DIR}/src/GeomAPI + ${PROJECT_SOURCE_DIR}/src/GeomDataAPI ) INSTALL(TARGETS GeomValidators DESTINATION plugins) + diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt index bc1ab4e90..d16badfc7 100644 --- a/src/ModuleBase/CMakeLists.txt +++ b/src/ModuleBase/CMakeLists.txt @@ -145,12 +145,12 @@ SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESO INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR}/src/Config - ${CMAKE_SOURCE_DIR}/src/Events - ${CMAKE_SOURCE_DIR}/src/ModelAPI - ${CMAKE_SOURCE_DIR}/src/GeomDataAPI - ${CMAKE_SOURCE_DIR}/src/GeomAPI - ${CMAKE_SOURCE_DIR}/src/GeomAlgoAPI + ${PROJECT_SOURCE_DIR}/src/Config + ${PROJECT_SOURCE_DIR}/src/Events + ${PROJECT_SOURCE_DIR}/src/ModelAPI + ${PROJECT_SOURCE_DIR}/src/GeomDataAPI + ${PROJECT_SOURCE_DIR}/src/GeomAPI + ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI ${SUIT_INCLUDE} ) @@ -159,3 +159,4 @@ ADD_LIBRARY(ModuleBase SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) TARGET_LINK_LIBRARIES(ModuleBase GeomAPI ${PROJECT_LIBRARIES}) INSTALL(TARGETS ModuleBase DESTINATION bin) + diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt index 743e937fe..b18a8308d 100644 --- a/src/PartSet/CMakeLists.txt +++ b/src/PartSet/CMakeLists.txt @@ -91,24 +91,27 @@ SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESO #SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${PROJECT_RESOURCES}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI - ${CMAKE_SOURCE_DIR}/src/Config - ${CMAKE_SOURCE_DIR}/src/Events - ${CMAKE_SOURCE_DIR}/src/ModuleBase - ${CMAKE_SOURCE_DIR}/src/ModelAPI - ${CMAKE_SOURCE_DIR}/src/GeomDataAPI - ${CMAKE_SOURCE_DIR}/src/GeomAlgoAPI - ${CMAKE_SOURCE_DIR}/src/SketchPlugin - ${CMAKE_SOURCE_DIR}/src/ExchangePlugin - ${CMAKE_SOURCE_DIR}/src/SketcherPrs - ${CMAKE_SOURCE_DIR}/src/FeaturesPlugin - ${CMAKE_SOURCE_DIR}/src/PartSetPlugin - ${CMAKE_SOURCE_DIR}/src/GeomAPI - ${CMAKE_SOURCE_DIR}/src/AppElements +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI + ${PROJECT_SOURCE_DIR}/src/Config + ${PROJECT_SOURCE_DIR}/src/Events + ${PROJECT_SOURCE_DIR}/src/ModuleBase + ${PROJECT_SOURCE_DIR}/src/ModelAPI + ${PROJECT_SOURCE_DIR}/src/GeomDataAPI + ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI + ${PROJECT_SOURCE_DIR}/src/SketchPlugin + ${PROJECT_SOURCE_DIR}/src/ExchangePlugin + ${PROJECT_SOURCE_DIR}/src/SketcherPrs + ${PROJECT_SOURCE_DIR}/src/FeaturesPlugin + ${PROJECT_SOURCE_DIR}/src/PartSetPlugin + ${PROJECT_SOURCE_DIR}/src/GeomAPI ${CAS_INCLUDE_DIRS} ${SUIT_INCLUDE} ) +IF(NOT ${HAVE_SALOME}) + INCLUDE_DIRECTORIES(${APPELEMENTS_INCLUDE_DIR}) +ENDIF(NOT ${HAVE_SALOME}) + ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS}) ADD_LIBRARY(PartSet SHARED ${PROJECT_SOURCES} @@ -125,3 +128,4 @@ ADD_DEPENDENCIES(PartSet ModuleBase) INSTALL(TARGETS PartSet DESTINATION bin) #INSTALL(FILES ${QM_RESOURCES} DESTINATION bin) + diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt index 56f7bebd6..b928158f3 100644 --- a/src/XGUI/CMakeLists.txt +++ b/src/XGUI/CMakeLists.txt @@ -122,7 +122,7 @@ SET(PROJECT_INCLUDES ${SUIT_INCLUDE}) IF(NOT ${HAVE_SALOME}) - SET(PROJECT_INCLUDES ${PROJECT_INCLUDES} ${PROJECT_SOURCE_DIR}/src/AppElements) + SET(PROJECT_INCLUDES ${PROJECT_INCLUDES} ${APPELEMENTS_INCLUDE_DIR}) ENDIF(NOT ${HAVE_SALOME}) INCLUDE_DIRECTORIES(${PROJECT_INCLUDES}) @@ -146,3 +146,4 @@ TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES}) INSTALL(TARGETS XGUI DESTINATION bin) INSTALL(FILES ${QM_RESOURCES} DESTINATION bin) INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources) +