Salome HOME
projects
/
modules
/
yacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4f6d21d
)
bos #33720: implement static libraries for windows. These changes are aimed to resol...
bos/33720
2/head
author
Nabil Ghodbane
<nabil.ghodbane@cea.fr>
Tue, 23 May 2023 07:19:53 +0000
(09:19 +0200)
committer
Nabil Ghodbane
<nabil.ghodbane@cea.fr>
Tue, 23 May 2023 07:19:53 +0000
(09:19 +0200)
src/bases/Test/CMakeLists.txt
patch
|
blob
|
history
src/engine/Plugin/CMakeLists.txt
patch
|
blob
|
history
src/engine/Test/CMakeLists.txt
patch
|
blob
|
history
src/runtime/Test/CMakeLists.txt
patch
|
blob
|
history
src/salomegui_swig/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/src/bases/Test/CMakeLists.txt
b/src/bases/Test/CMakeLists.txt
index 35fba9158cd8f4e9ba9eae21bc08d82d518b3105..bfb4e46b0beacf0a1e73d2c7003aa8c1ca63afd9 100644
(file)
--- a/
src/bases/Test/CMakeLists.txt
+++ b/
src/bases/Test/CMakeLists.txt
@@
-42,6
+42,12
@@
SET(TestBases_SOURCES
# --- rules ---
# --- rules ---
+if(WIN32)
+ add_library(YACSDLTest_lib STATIC ${YACSDLTest_SOURCES})
+ TARGET_LINK_LIBRARIES(YACSDLTest_lib ${_link_LIBRARIES})
+ set_target_properties(YACSDLTest_lib PROPERTIES OUTPUT_NAME YACSDLTest)
+endif(WIN32)
+
ADD_LIBRARY(YACSDLTest ${YACSDLTest_SOURCES})
INSTALL(TARGETS YACSDLTest EXPORT ${PROJECT_NAME}TargetGroup
DESTINATION ${SALOME_YACS_INSTALL_TEST_LIB})
ADD_LIBRARY(YACSDLTest ${YACSDLTest_SOURCES})
INSTALL(TARGETS YACSDLTest EXPORT ${PROJECT_NAME}TargetGroup
DESTINATION ${SALOME_YACS_INSTALL_TEST_LIB})
diff --git
a/src/engine/Plugin/CMakeLists.txt
b/src/engine/Plugin/CMakeLists.txt
index 310265215fbb3b0f2ea6768e8a558743dd40e854..32451b921375f4fb24dd4998e8d1bf04cd16a278 100644
(file)
--- a/
src/engine/Plugin/CMakeLists.txt
+++ b/
src/engine/Plugin/CMakeLists.txt
@@
-41,7
+41,11
@@
SET(PluginSimplex_SOURCES
)
# --- rules ---
)
# --- rules ---
-
+if(WIN32)
+ add_library(PluginSimplex_lib STATIC ${PluginSimplex_SOURCES})
+ TARGET_LINK_LIBRARIES(PluginSimplex_lib ${_link_LIBRARIES})
+ set_target_properties(PluginSimplex_lib PROPERTIES OUTPUT_NAME PluginSimplex)
+endif(WIN32)
ADD_LIBRARY(PluginSimplex ${PluginSimplex_SOURCES})
TARGET_LINK_LIBRARIES(PluginSimplex YACSlibEngine)
INSTALL(TARGETS PluginSimplex EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
ADD_LIBRARY(PluginSimplex ${PluginSimplex_SOURCES})
TARGET_LINK_LIBRARIES(PluginSimplex YACSlibEngine)
INSTALL(TARGETS PluginSimplex EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
diff --git
a/src/engine/Test/CMakeLists.txt
b/src/engine/Test/CMakeLists.txt
index a711cd0ebc2b5c55533b9f843446fc296a33e13c..b089edbe0b766a2b2b4eb1ebf3f7f65a8ccc63c4 100644
(file)
--- a/
src/engine/Test/CMakeLists.txt
+++ b/
src/engine/Test/CMakeLists.txt
@@
-63,7
+63,11
@@
SET(IntegrationTestEngine_SOURCES
)
# --- rules ---
)
# --- rules ---
-
+if(WIN32)
+ add_library(PluginOptEvTest1_lib STATIC ${PluginOptEvTest1_SOURCES})
+ TARGET_LINK_LIBRARIES(PluginOptEvTest1_lib ${_link_LIBRARIES})
+ set_target_properties(PluginOptEvTest1_lib PROPERTIES OUTPUT_NAME PluginOptEvTest1)
+endif(WIN32)
ADD_LIBRARY(PluginOptEvTest1 ${PluginOptEvTest1_SOURCES})
TARGET_LINK_LIBRARIES(PluginOptEvTest1 YACSlibEngine)
INSTALL(TARGETS PluginOptEvTest1 EXPORT ${PROJECT_NAME}TargetGroup
ADD_LIBRARY(PluginOptEvTest1 ${PluginOptEvTest1_SOURCES})
TARGET_LINK_LIBRARIES(PluginOptEvTest1 YACSlibEngine)
INSTALL(TARGETS PluginOptEvTest1 EXPORT ${PROJECT_NAME}TargetGroup
diff --git
a/src/runtime/Test/CMakeLists.txt
b/src/runtime/Test/CMakeLists.txt
index d3549a5c77124c4b12807e469c33e7d287ba890d..2775341eb7554c9eed46b98eceabcf49a4d88b9d 100644
(file)
--- a/
src/runtime/Test/CMakeLists.txt
+++ b/
src/runtime/Test/CMakeLists.txt
@@
-104,6
+104,12
@@
TARGET_LINK_LIBRARIES(runtimeTestEchoSrv runtime_echo ${OMNIORB_LIBRARIES})
ADD_EXECUTABLE(echo_clt ${echo_clt_SOURCES})
TARGET_LINK_LIBRARIES(echo_clt runtime_echo ${OMNIORB_LIBRARIES})
ADD_EXECUTABLE(echo_clt ${echo_clt_SOURCES})
TARGET_LINK_LIBRARIES(echo_clt runtime_echo ${OMNIORB_LIBRARIES})
+if(WIN32)
+ add_library(TestComponentLocal_lib STATIC ${TestComponentLocal_SOURCES})
+ TARGET_LINK_LIBRARIES(TestComponentLocal_lib ${_link_LIBRARIES})
+ set_target_properties(TestComponentLocal_lib PROPERTIES OUTPUT_NAME TestComponentLocal)
+endif(WIN32)
+
ADD_LIBRARY(TestComponentLocal ${TestComponentLocal_SOURCES})
TARGET_LINK_LIBRARIES(TestComponentLocal YACSlibEngine)
ADD_LIBRARY(TestComponentLocal ${TestComponentLocal_SOURCES})
TARGET_LINK_LIBRARIES(TestComponentLocal YACSlibEngine)
diff --git
a/src/salomegui_swig/CMakeLists.txt
b/src/salomegui_swig/CMakeLists.txt
index 4b71545558a900d2679ac836c575c6237c39389e..1c32f118458f9d3123af441737860a65df1ac80c 100644
(file)
--- a/
src/salomegui_swig/CMakeLists.txt
+++ b/
src/salomegui_swig/CMakeLists.txt
@@
-82,6
+82,11
@@
IF(SALOME_BUILD_DOC)
ENDIF(SALOME_BUILD_DOC)
# --- rules ---
ENDIF(SALOME_BUILD_DOC)
# --- rules ---
+IF(WIN32)
+ add_library(YACS_Swig_lib STATIC ${YACS_Swig_SOURCES})
+ TARGET_LINK_LIBRARIES(YACS_Swig_lib ${_link_LIBRARIES})
+ set_target_properties(YACS_Swig_lib PROPERTIES OUTPUT_NAME YACS_Swig)
+ENDIF(WIN32)
ADD_LIBRARY(YACS_Swig ${YACS_Swig_SOURCES})
TARGET_LINK_LIBRARIES(YACS_Swig ${_link_LIBRARIES})
INSTALL(TARGETS YACS_Swig EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
ADD_LIBRARY(YACS_Swig ${YACS_Swig_SOURCES})
TARGET_LINK_LIBRARIES(YACS_Swig ${_link_LIBRARIES})
INSTALL(TARGETS YACS_Swig EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})