From: vsv Date: Wed, 18 Jan 2017 13:02:54 +0000 (+0300) Subject: Replace XAO library by the same XAOShaper in order to avoid mixing with the same... X-Git-Tag: V_2.7.0~327 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=05687adb19f41cfca10816bfbbe83c7c27b091de;p=modules%2Fshaper.git Replace XAO library by the same XAOShaper in order to avoid mixing with the same library from SALOME --- diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt index 2e11f0375..f304e5bf7 100644 --- a/src/ExchangePlugin/CMakeLists.txt +++ b/src/ExchangePlugin/CMakeLists.txt @@ -47,7 +47,7 @@ SET(PROJECT_LIBRARIES ModelHighAPI GeomAPI GeomAlgoAPI - XAO + XAOShaper ) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES}) diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt index 68048d8e9..522f44358 100644 --- a/src/GeomAlgoAPI/CMakeLists.txt +++ b/src/GeomAlgoAPI/CMakeLists.txt @@ -99,7 +99,7 @@ SET(PROJECT_LIBRARIES GeomAPI GeomAlgoImpl ModelAPI - XAO + XAOShaper ${CAS_OCAF} ${CAS_SHAPE} ${CAS_TKBO} diff --git a/src/XAO/CMakeLists.txt b/src/XAO/CMakeLists.txt index 2e9700e84..049f6758c 100644 --- a/src/XAO/CMakeLists.txt +++ b/src/XAO/CMakeLists.txt @@ -86,6 +86,6 @@ SET(XAO_SOURCES # --- rules --- -ADD_LIBRARY(XAO SHARED ${XAO_SOURCES} ${XAO_HEADERS}) -TARGET_LINK_LIBRARIES(XAO ${PROJECT_LIBRARIES}) -INSTALL(TARGETS XAO DESTINATION ${SHAPER_INSTALL_BIN}) +ADD_LIBRARY(XAOShaper SHARED ${XAO_SOURCES} ${XAO_HEADERS}) +TARGET_LINK_LIBRARIES(XAOShaper ${PROJECT_LIBRARIES}) +INSTALL(TARGETS XAOShaper DESTINATION ${SHAPER_INSTALL_BIN}) diff --git a/src/XAO/tests/CMakeLists.txt b/src/XAO/tests/CMakeLists.txt index 9a7226a79..0f2e73c12 100644 --- a/src/XAO/tests/CMakeLists.txt +++ b/src/XAO/tests/CMakeLists.txt @@ -35,7 +35,7 @@ ADD_DEFINITIONS( # libraries to link to SET(_link_LIBRARIES ${CPPUNIT_LIBRARIES} - XAO + XAOShaper ) # --- sources ---