Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5716015
)
Replace XAO library by the same XAOShaper in order to avoid mixing with the same...
author
vsv
<vitaly.smetannikov@opencascade.com>
Wed, 18 Jan 2017 13:02:54 +0000
(16:02 +0300)
committer
vsv
<vitaly.smetannikov@opencascade.com>
Wed, 18 Jan 2017 13:03:32 +0000
(16:03 +0300)
src/ExchangePlugin/CMakeLists.txt
patch
|
blob
|
history
src/GeomAlgoAPI/CMakeLists.txt
patch
|
blob
|
history
src/XAO/CMakeLists.txt
patch
|
blob
|
history
src/XAO/tests/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/src/ExchangePlugin/CMakeLists.txt
b/src/ExchangePlugin/CMakeLists.txt
index 2e11f037530f328897f399b0215658bcccf55b1c..f304e5bf7ae915f185714ac10eeab92940f3aba9 100644
(file)
--- a/
src/ExchangePlugin/CMakeLists.txt
+++ b/
src/ExchangePlugin/CMakeLists.txt
@@
-47,7
+47,7
@@
SET(PROJECT_LIBRARIES
ModelHighAPI
GeomAPI
GeomAlgoAPI
- XAO
+ XAO
Shaper
)
SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
diff --git
a/src/GeomAlgoAPI/CMakeLists.txt
b/src/GeomAlgoAPI/CMakeLists.txt
index 68048d8e9c858202525e6d5b11ee27653ba515eb..522f443589da353f1ada713360855b95fb921b3c 100644
(file)
--- a/
src/GeomAlgoAPI/CMakeLists.txt
+++ b/
src/GeomAlgoAPI/CMakeLists.txt
@@
-99,7
+99,7
@@
SET(PROJECT_LIBRARIES
GeomAPI
GeomAlgoImpl
ModelAPI
- XAO
+ XAO
Shaper
${CAS_OCAF}
${CAS_SHAPE}
${CAS_TKBO}
diff --git
a/src/XAO/CMakeLists.txt
b/src/XAO/CMakeLists.txt
index 2e9700e8412423ec100781c5ec4d2da1b41161f8..049f6758c4dfcb19b938a68c3d2049323eba89da 100644
(file)
--- 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(XAO
Shaper
SHARED ${XAO_SOURCES} ${XAO_HEADERS})
+TARGET_LINK_LIBRARIES(XAO
Shaper
${PROJECT_LIBRARIES})
+INSTALL(TARGETS XAO
Shaper
DESTINATION ${SHAPER_INSTALL_BIN})
diff --git
a/src/XAO/tests/CMakeLists.txt
b/src/XAO/tests/CMakeLists.txt
index 9a7226a799aa18b3e5a64e30cb6bcb5b0fdccfe7..0f2e73c12542ca42ae4c75498cc02608fc534c62 100644
(file)
--- 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
+ XAO
Shaper
)
# --- sources ---