Install all Python swig wrappings in SALOME_INSTALL_PYTHON

diff --git a/src/ArgvKeeper/CMakeLists.txt b/src/ArgvKeeper/CMakeLists.txt
index f711f1e676ed540dd9f559ed15bea34527af60d0..d5139e5c3de508031f2dc37f4bdd489131c905ba 100644 (file)
--- 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 16847fc200644cea4e56fbc642ad2a04575c2292..b455514e3f9daa30874db857fb25b3f8db2369f5 100644 (file)
--- 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 17d8f05564a2fc69f76baa5ff1870d8a42b11ef3..85d90a79754fbd04aba24214005232e852ce30bf 100644 (file)
--- 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 41f641f513242390f4c3f559a4b27a9e78c84d3c..06a7ddb768fc5e2d0d15ad8c8ade99c4c5a0e316 100644 (file)
--- 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 24b023e37c57cb2839f479178e951f0d2f4ff07e..7a578ca50d869d0c877c0dd057b4be9caad26093 100644 (file)
--- 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 93917cc63d84711a6fe06469bd7e0a05cccc88f2..5ce8117c2938cbf53a616e1573aa3ddc6a2276c7 100644 (file)
--- 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 f168cfc2a3453f1be734ec080aafe879cc00fd9c..5faab9543012f6a6595975243eeb03f74d185229 100644 (file)
--- 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 9748cf92d3d67bbb253643b174abd28b740e3025..4d7fd155f94763b2f4f0a134c08d6c1855c5de31 100644 (file)
--- 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 1fd8d6023cdd4011b299f7ebaa43f9a3a35dedc6..23c2afa53c24c0390032f97edb95b03387f7a8d7 100644 (file)
--- 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 9912f13c99cb2e78bbc69f0cb361595c437ab39e..3a8940a19b4f4501e87bdbbcabd9dcaef17201bc 100644 (file)
--- 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}")