From 73cd09966865af08bae1b5abd30c73c341132142 Mon Sep 17 00:00:00 2001 From: Gilles DAVID Date: Tue, 22 Oct 2024 13:42:43 +0200 Subject: [PATCH] Install all Python swig wrappings in SALOME_INSTALL_PYTHON --- src/ArgvKeeper/CMakeLists.txt | 2 +- src/Basics/CMakeLists.txt | 2 +- src/Container/CMakeLists.txt | 2 +- src/KernelHelpers/CMakeLists.txt | 2 +- src/Launcher/CMakeLists.txt | 2 +- src/Logger/CMakeLists.txt | 2 +- src/ModuleCatalog/CMakeLists.txt | 2 +- src/NamingService/CMakeLists.txt | 2 +- src/SALOMEDS/CMakeLists.txt | 2 +- src/SALOMESDS/CMakeLists.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ArgvKeeper/CMakeLists.txt b/src/ArgvKeeper/CMakeLists.txt index f711f1e67..d5139e5c3 100644 --- a/src/ArgvKeeper/CMakeLists.txt +++ b/src/ArgvKeeper/CMakeLists.txt @@ -42,7 +42,7 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_ArgvKeeper PROPERTIES DEBUG_OUTPUT_NAME _ArgvKeeper_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(ArgvKeeper ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} ArgvKeeper) -INSTALL(TARGETS _ArgvKeeper DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS _ArgvKeeper DESTINATION ${SALOME_INSTALL_PYTHON}) SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/ArgvKeeper.py ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_ArgvKeeper_REAL_NAME}") diff --git a/src/Basics/CMakeLists.txt b/src/Basics/CMakeLists.txt index 16847fc20..b455514e3 100644 --- a/src/Basics/CMakeLists.txt +++ b/src/Basics/CMakeLists.txt @@ -65,7 +65,7 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_KernelBasis PROPERTIES DEBUG_OUTPUT_NAME _KernelBasis_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(KernelBasis ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SALOMEBasics) -install(TARGETS _KernelBasis DESTINATION ${SALOME_INSTALL_LIBS}) +install(TARGETS _KernelBasis DESTINATION ${SALOME_INSTALL_PYTHON}) install(FILES ${KernelBasis_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_KernelBasis_REAL_NAME}") diff --git a/src/Container/CMakeLists.txt b/src/Container/CMakeLists.txt index 17d8f0556..85d90a797 100644 --- a/src/Container/CMakeLists.txt +++ b/src/Container/CMakeLists.txt @@ -158,7 +158,7 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_KernelContainer PROPERTIES DEBUG_OUTPUT_NAME _KernelContainer_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(KernelContainer ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeContainer SalomeKernelHelpers) -install(TARGETS _KernelContainer DESTINATION ${SALOME_INSTALL_LIBS}) +install(TARGETS _KernelContainer DESTINATION ${SALOME_INSTALL_PYTHON}) install(FILES ${KernelContainer_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_KernelContainer_REAL_NAME}") diff --git a/src/KernelHelpers/CMakeLists.txt b/src/KernelHelpers/CMakeLists.txt index 41f641f51..06a7ddb76 100644 --- a/src/KernelHelpers/CMakeLists.txt +++ b/src/KernelHelpers/CMakeLists.txt @@ -91,7 +91,7 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_KernelServices PROPERTIES DEBUG_OUTPUT_NAME _KernelServices_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(KernelServices ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeKernelHelpers) -install(TARGETS _KernelServices DESTINATION ${SALOME_INSTALL_LIBS}) +install(TARGETS _KernelServices DESTINATION ${SALOME_INSTALL_PYTHON}) install(FILES ${KernelServices_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_KernelServices_REAL_NAME}") diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt index 24b023e37..7a578ca50 100644 --- a/src/Launcher/CMakeLists.txt +++ b/src/Launcher/CMakeLists.txt @@ -162,7 +162,7 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_KernelLauncher PROPERTIES DEBUG_OUTPUT_NAME _KernelLauncher_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(KernelLauncher ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeDS SalomeKernelHelpers) -install(TARGETS _KernelLauncher DESTINATION ${SALOME_INSTALL_LIBS}) +install(TARGETS _KernelLauncher DESTINATION ${SALOME_INSTALL_PYTHON}) install(FILES ${KernelLauncher_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_KernelLauncher_REAL_NAME}") diff --git a/src/Logger/CMakeLists.txt b/src/Logger/CMakeLists.txt index 93917cc63..5ce8117c2 100644 --- a/src/Logger/CMakeLists.txt +++ b/src/Logger/CMakeLists.txt @@ -73,7 +73,7 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_KernelLogger PROPERTIES DEBUG_OUTPUT_NAME _KernelLogger_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(KernelLogger ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeLoggerServer) -install(TARGETS _KernelLogger DESTINATION ${SALOME_INSTALL_LIBS}) +install(TARGETS _KernelLogger DESTINATION ${SALOME_INSTALL_PYTHON}) install(FILES ${KernelLogger_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_KernelLogger_REAL_NAME}") diff --git a/src/ModuleCatalog/CMakeLists.txt b/src/ModuleCatalog/CMakeLists.txt index f168cfc2a..5faab9543 100644 --- a/src/ModuleCatalog/CMakeLists.txt +++ b/src/ModuleCatalog/CMakeLists.txt @@ -84,7 +84,7 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_KernelModuleCatalog PROPERTIES DEBUG_OUTPUT_NAME _KernelModuleCatalog_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(KernelModuleCatalog ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeCatalog SalomeKernelHelpers) -install(TARGETS _KernelModuleCatalog DESTINATION ${SALOME_INSTALL_LIBS}) +install(TARGETS _KernelModuleCatalog DESTINATION ${SALOME_INSTALL_PYTHON}) install(FILES ${KernelModuleCatalog_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_KernelModuleCatalog_REAL_NAME}") diff --git a/src/NamingService/CMakeLists.txt b/src/NamingService/CMakeLists.txt index 9748cf92d..4d7fd155f 100644 --- a/src/NamingService/CMakeLists.txt +++ b/src/NamingService/CMakeLists.txt @@ -75,6 +75,6 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_NamingService PROPERTIES DEBUG_OUTPUT_NAME _NamingService_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(NamingService ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeNS) -install(TARGETS _NamingService DESTINATION ${SALOME_INSTALL_LIBS}) +install(TARGETS _NamingService DESTINATION ${SALOME_INSTALL_PYTHON}) install(FILES ${NamingService_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_NamingService_REAL_NAME}") diff --git a/src/SALOMEDS/CMakeLists.txt b/src/SALOMEDS/CMakeLists.txt index 1fd8d6023..23c2afa53 100644 --- a/src/SALOMEDS/CMakeLists.txt +++ b/src/SALOMEDS/CMakeLists.txt @@ -178,7 +178,7 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_KernelDS PROPERTIES DEBUG_OUTPUT_NAME _KernelDS_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(KernelDS ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeDS SalomeKernelHelpers) -install(TARGETS _KernelDS DESTINATION ${SALOME_INSTALL_LIBS}) +install(TARGETS _KernelDS DESTINATION ${SALOME_INSTALL_PYTHON}) install(FILES ${KernelDS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_KernelDS_REAL_NAME}") diff --git a/src/SALOMESDS/CMakeLists.txt b/src/SALOMESDS/CMakeLists.txt index 9912f13c9..3a8940a19 100644 --- a/src/SALOMESDS/CMakeLists.txt +++ b/src/SALOMESDS/CMakeLists.txt @@ -88,6 +88,6 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_KernelSDS PROPERTIES DEBUG_OUTPUT_NAME _KernelSDS_d) ENDIF(${MACHINE} STREQUAL WINDOWS) SWIG_LINK_LIBRARIES(KernelSDS ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeSDS) -install(TARGETS _KernelSDS DESTINATION ${SALOME_INSTALL_LIBS}) +install(TARGETS _KernelSDS DESTINATION ${SALOME_INSTALL_PYTHON}) install(FILES ${KernelSDS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_KernelSDS_REAL_NAME}") -- 2.39.2