Installation des modules importés dans SALOME_INSTALL_PYTHON puisque ce ne sont pas...

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 154d6eb26e16b36b4d012788fd040ce627dc08fa..fae2b482f7bc6ea9a71d193f5ff7d88428e7ee25 100644 (file)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -31,40 +31,44 @@ SALOME_CONFIGURE_FILE(salomeContextUtils.py.in salomeContextUtils.py)
 
 # These files are executable scripts
 SET(SCRIPTS
-  appli_clean.sh
-  runIDLparser
   addToKillList.py
+  appli_clean.sh
   appli_gen.py
   envSalome.py
   killSalome.py
   killSalomeWithPort.py
-  launchConfigureParser.py
-  nameserver.py
   NSparam.py
-  orbmodule.py
-  ORBConfigFile.py
-  parseConfigFile.py
-  PortManager.py
-  runSalomeCommon.py
+  pythonpath_reduction.py
+  runConsole.py
+  runIDLparser
+  runRemote.py
   runSalome.py
+  runSalomeNoServer.py
   runSalomeOld.py
   runSalomeOnDemand.py
-  runSalomeNoServer.py
-  runSession.py
-  runConsole.py
-  runRemote.py
-  runTests.py
-  ${CMAKE_CURRENT_BINARY_DIR}/salomeContextUtils.py
   salomeContext.py
-  salome_utils.py
-  searchFreePort.py
-  server.py
+  ${CMAKE_CURRENT_BINARY_DIR}/salomeContextUtils.py
   setenv.py
   showNS.py
   virtual_salome.py
   waitContainers.py
   waitNS.py
-  pythonpath_reduction.py
   )
 
+SET(PACKAGES
+  launchConfigureParser.py
+  nameserver.py
+  ORBConfigFile.py
+  orbmodule.py
+  parseConfigFile.py
+  PortManager.py
+  runSalomeCommon.py
+  runSession.py
+  runTests.py
+  salome_utils.py
+  searchFreePort.py
+  server.py
+)
+
 SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})
+SALOME_INSTALL_SCRIPTS("${PACKAGES}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)
\ No newline at end of file

diff --git a/bin/SalomeOnDemandTK/CMakeLists.txt b/bin/SalomeOnDemandTK/CMakeLists.txt
index 1fd27175a859f85f07c9f3be4b2c3f83fa1402f9..0fa083dc2a16e8f1df1a0418ae72d0cfe9b68c94 100644 (file)
--- a/bin/SalomeOnDemandTK/CMakeLists.txt
+++ b/bin/SalomeOnDemandTK/CMakeLists.txt
@@ -28,7 +28,12 @@ SET(SCRIPTS
   extension_query.py
   extension_remover.py
   extension_unpacker.py
+
+SET(PACKAGES
   extension_utilities.py
 )
+)
 
 SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}/SalomeOnDemandTK)
+
+INSTALL(FILES ${PACKAGES} DESTINATION ${SALOME_INSTALL_PYTHON})

diff --git a/bin/appliskel/CMakeLists.txt b/bin/appliskel/CMakeLists.txt
index 0de96e952a5d7e54ff16d7ec2aca92fea76c1784..8ab3970e7a3fc97ba2e22c188575ba2fef824256 100644 (file)
--- a/bin/appliskel/CMakeLists.txt
+++ b/bin/appliskel/CMakeLists.txt
@@ -36,9 +36,13 @@ SET(SCRIPTS
   .salome_run # this is the Python launcher (without .py extension to avoid conflicts when importing salome python package)
   salome # this is the Python wrapper (without .py extension to avoid conflicts when importing salome python package)
   salome_mesa # this is the Python wrapper using MESA (work around display issue)
+  .salome-completion.sh
+)
+
+SET(PACKAGES
   salome_common.py
   salome_starter.py
-  .salome-completion.sh
 )
 
+SALOME_INSTALL_SCRIPTS("${PACKAGES}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)
 SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}/appliskel)

diff --git a/src/ArgvKeeper/CMakeLists.txt b/src/ArgvKeeper/CMakeLists.txt
index d5139e5c3de508031f2dc37f4bdd489131c905ba..1089254e230d2dab09232e738f9aed6cbf594881 100644 (file)
--- a/src/ArgvKeeper/CMakeLists.txt
+++ b/src/ArgvKeeper/CMakeLists.txt
@@ -33,6 +33,7 @@ INSTALL(FILES ArgvKeeper.hxx DESTINATION ${SALOME_INSTALL_HEADERS})
 SET_SOURCE_FILES_PROPERTIES(ArgvKeeper.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(ArgvKeeper.i PROPERTIES SWIG_FLAGS "-py3")
 SET_SOURCE_FILES_PROPERTIES(ArgvKeeper_wrap.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H")
+SET(_swig_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/ArgvKeeper.py )
 IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
   SWIG_ADD_MODULE(ArgvKeeper python ArgvKeeper.i ArgvKeeper.hxx)
 ELSE()
@@ -43,9 +44,7 @@ IF(${MACHINE} STREQUAL WINDOWS)
 ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(ArgvKeeper ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} ArgvKeeper)
 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}")
+SALOME_INSTALL_SCRIPTS( "${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)
 
 # Tests
 IF(SALOME_BUILD_TESTS)

diff --git a/src/Basics/CMakeLists.txt b/src/Basics/CMakeLists.txt
index b455514e3f9daa30874db857fb25b3f8db2369f5..6d26785dd799388fee33f531e2596fa5ef5b95ca 100644 (file)
--- a/src/Basics/CMakeLists.txt
+++ b/src/Basics/CMakeLists.txt
@@ -67,7 +67,7 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(KernelBasis ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SALOMEBasics)
 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}")
+install(FILES ${_swig_SCRIPTS} DESTINATION ${SALOME_INSTALL_PYTHON})
 
 SALOME_CONFIGURE_FILE(smIdType.hxx.in smIdType.hxx INSTALL ${SALOME_INSTALL_HEADERS})
 

diff --git a/src/Container/CMakeLists.txt b/src/Container/CMakeLists.txt
index 85d90a79754fbd04aba24214005232e852ce30bf..054cb6ec3ed77fcad9acd1a951ac5aa84b001874 100644 (file)
--- a/src/Container/CMakeLists.txt
+++ b/src/Container/CMakeLists.txt
@@ -41,15 +41,18 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-SET(SCRIPTS
+SET(PACKAGES
   SALOME_ComponentPy.py
   SALOME_PyNode.py
   SALOME_Container.py
   SALOME_ContainerHelper.py
-  SALOME_ContainerPy.py
   SALOME_GlobalsImpl.py
 )
 
+SET(SCRIPTS
+  SALOME_ContainerPy.py
+)
+
 ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 SET(COMMON_LIBS
   ArgvKeeper
@@ -160,7 +163,11 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(KernelContainer ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeContainer SalomeKernelHelpers)
 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}")
+# /!\ Order of next 2 lines is important
+# because SALOME_INSTALL_SCRIPTS macro will compute the pyc/pyo files
+# and ${_swig_SCRIPTS} file needs ${PACKAGES}
+SALOME_INSTALL_SCRIPTS("${PACKAGES}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)
+SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)
 
 INSTALL(DIRECTORY ScriptsTemplate DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})
 INSTALL(FILES salome_process_launcher salome_process_attach PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${SALOME_INSTALL_BINS} )

diff --git a/src/DSC/DSC_Python/CMakeLists.txt b/src/DSC/DSC_Python/CMakeLists.txt
index 289d3300a6c41be59f5940f9d17b5d29712b4c69..319782d7d42d9970e014859e243e9f7ac594b87e 100644 (file)
--- a/src/DSC/DSC_Python/CMakeLists.txt
+++ b/src/DSC/DSC_Python/CMakeLists.txt
@@ -71,4 +71,4 @@ SET(SCRIPTS
   dsccalcium.py
   ${CMAKE_CURRENT_BINARY_DIR}/calcium.py
 )
-SALOME_INSTALL_SCRIPTS( "${SCRIPTS}" ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_calcium_REAL_NAME}")
+SALOME_INSTALL_SCRIPTS( "${SCRIPTS}" ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_calcium_REAL_NAME}" DEF_PERMS)

diff --git a/src/KERNEL_PY/CMakeLists.txt b/src/KERNEL_PY/CMakeLists.txt
index de55919f0a59fc4cbe5780d3e46a6597f2dd2b01..0ae46169f94c41ce1d43ca73a4fc914f414b594a 100644 (file)
--- a/src/KERNEL_PY/CMakeLists.txt
+++ b/src/KERNEL_PY/CMakeLists.txt
@@ -42,5 +42,5 @@ SET(salomepython_PYTHON
     salome_psutil.py
   )
 
-SALOME_INSTALL_SCRIPTS("${salomepython_PYTHON}" ${SALOME_INSTALL_PYTHON})
-SALOME_INSTALL_SCRIPTS(__init__.py ${SALOME_INSTALL_PYTHON}/salome)
+SALOME_INSTALL_SCRIPTS("${salomepython_PYTHON}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)
+SALOME_INSTALL_SCRIPTS(__init__.py ${SALOME_INSTALL_PYTHON}/salome DEF_PERMS)
\ No newline at end of file

diff --git a/src/KERNEL_PY/kernel/CMakeLists.txt b/src/KERNEL_PY/kernel/CMakeLists.txt
index 96a8407346d26c64bc3d60d4590c6027393b219c..89655d99e57833659c4ae54151b755da519d5007 100644 (file)
--- a/src/KERNEL_PY/kernel/CMakeLists.txt
+++ b/src/KERNEL_PY/kernel/CMakeLists.txt
@@ -45,4 +45,4 @@ LIST(APPEND mypkgpython_PYTHON
     services.py
     ${CMAKE_CURRENT_BINARY_DIR}/logconfig.py
 )
-SALOME_INSTALL_SCRIPTS("${mypkgpython_PYTHON}" ${SALOME_INSTALL_PYTHON}/salome/kernel)
+SALOME_INSTALL_SCRIPTS("${mypkgpython_PYTHON}" ${SALOME_INSTALL_PYTHON}/salome/kernel DEF_PERMS)

diff --git a/src/KERNEL_PY/kernel/parametric/CMakeLists.txt b/src/KERNEL_PY/kernel/parametric/CMakeLists.txt
index a90294a8a78e04b5fe51ebf2908be55094633c80..527a0179cfebecba95e93cf38dc378a591e3b07b 100644 (file)
--- a/src/KERNEL_PY/kernel/parametric/CMakeLists.txt
+++ b/src/KERNEL_PY/kernel/parametric/CMakeLists.txt
@@ -25,4 +25,4 @@ SET(mypkgpython_PYTHON
 )
 
 # Executable scripts to be installed
-SALOME_INSTALL_SCRIPTS("${mypkgpython_PYTHON}" ${SALOME_INSTALL_PYTHON}/salome/kernel/parametric)
+SALOME_INSTALL_SCRIPTS("${mypkgpython_PYTHON}" ${SALOME_INSTALL_PYTHON}/salome/kernel/parametric DEF_PERMS)

diff --git a/src/KERNEL_PY/salome_kernel.py b/src/KERNEL_PY/salome_kernel.py
index 3ad848c5f6d080ea224d43e8f17261cadee0a7af..6bdaef322663a58f1800108caeae5371bcfd649d 100644 (file)
--- a/src/KERNEL_PY/salome_kernel.py
+++ b/src/KERNEL_PY/salome_kernel.py
@@ -21,7 +21,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#  File   : salome_kernel.py
+#  File   : salome_kernel_utils.py
 #  Author : Paul RASCLE, EDF
 #  Module : SALOME
 #  $Header$

diff --git a/src/KernelHelpers/CMakeLists.txt b/src/KernelHelpers/CMakeLists.txt
index 06a7ddb768fc5e2d0d15ad8c8ade99c4c5a0e316..55bb64a20a8658f7008b64a5004759331e467027 100644 (file)
--- a/src/KernelHelpers/CMakeLists.txt
+++ b/src/KernelHelpers/CMakeLists.txt
@@ -93,7 +93,7 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(KernelServices ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeKernelHelpers)
 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}")
+install(FILES ${_swig_SCRIPTS} DESTINATION ${SALOME_INSTALL_PYTHON})
 
 #
 

diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt
index 7a578ca50d869d0c877c0dd057b4be9caad26093..6acb1414d0f2560bb9278e2e4804a8407293c5a2 100644 (file)
--- a/src/Launcher/CMakeLists.txt
+++ b/src/Launcher/CMakeLists.txt
@@ -164,9 +164,11 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(KernelLauncher ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeDS SalomeKernelHelpers)
 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}")
-
 
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
 INSTALL(FILES testLauncher.xml DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})
-SALOME_INSTALL_SCRIPTS("${LAUNCHER_PYTHON_SCRIPTS}" ${SALOME_INSTALL_PYTHON})
+# /!\ Order of next 2 lines is important
+# because SALOME_INSTALL_SCRIPTS macro will compute the pyc/pyo files
+# and ${_swig_SCRIPTS} file needs ${LAUNCHER_PYTHON_SCRIPTS}
+SALOME_INSTALL_SCRIPTS("${LAUNCHER_PYTHON_SCRIPTS}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)
+SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)

diff --git a/src/Launcher_SWIG/CMakeLists.txt b/src/Launcher_SWIG/CMakeLists.txt
index 76e73d525fe0b399852ab8f77cc56fd4be8ef758..fea28b491eac4882be02ebc9269f8cc3a76fec09 100644 (file)
--- a/src/Launcher_SWIG/CMakeLists.txt
+++ b/src/Launcher_SWIG/CMakeLists.txt
@@ -67,7 +67,7 @@ INSTALL(TARGETS ${SWIG_MODULE_${Launcher_target_name}_REAL_NAME} DESTINATION ${S
 
 SET(PYFILES_TO_INSTALL ${PYFILES_TO_INSTALL} ${CMAKE_CURRENT_BINARY_DIR}/pylauncher.py)
 
-SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_${Launcher_target_name}_REAL_NAME}")
+SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_${Launcher_target_name}_REAL_NAME}" DEF_PERMS)
 
 install(FILES LauncherResourceDefinition.hxx SALOME_Launcher_SWIG.hxx DESTINATION ${SALOME_INSTALL_HEADERS})
 

diff --git a/src/LifeCycleCORBA/Test/CMakeLists.txt b/src/LifeCycleCORBA/Test/CMakeLists.txt
index b5fc97cccf36c8b69d91acf83cf85a5a95ac6020..cfca5b789c0505784a0a386285384802322386e0 100644 (file)
--- a/src/LifeCycleCORBA/Test/CMakeLists.txt
+++ b/src/LifeCycleCORBA/Test/CMakeLists.txt
@@ -67,7 +67,7 @@ TARGET_LINK_LIBRARIES(TestLifeCycleCORBA LifeCycleCORBATest NamingServiceTest Sa
 INSTALL(TARGETS TestLifeCycleCORBA DESTINATION ${LOCAL_TEST_DIR})
 
 # Executable scripts to be installed
-INSTALL(FILES TestLifeCycleCORBA.py DESTINATION ${LOCAL_TEST_DIR})
+SALOME_INSTALL_SCRIPTS(TestLifeCycleCORBA.py ${LOCAL_TEST_DIR})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${LOCAL_TEST_DIR})

diff --git a/src/LifeCycleCORBA_SWIG/CMakeLists.txt b/src/LifeCycleCORBA_SWIG/CMakeLists.txt
index 08aca0d6133104897864e9dd86d9f2033f7b4f94..1fb19d9ce94d2ee86fb869ce3fa082bb5124dd00 100644 (file)
--- a/src/LifeCycleCORBA_SWIG/CMakeLists.txt
+++ b/src/LifeCycleCORBA_SWIG/CMakeLists.txt
@@ -39,6 +39,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_BINARY_DIR}/idl
   )
 
+SET(_swig_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/libSALOME_LifeCycleCORBA.py )
 IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
   SWIG_ADD_MODULE(libSALOME_LifeCycleCORBA python libSALOME_LifeCycleCORBA.i)  
 ELSE()
@@ -54,8 +55,11 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 
 INSTALL(TARGETS _libSALOME_LifeCycleCORBA DESTINATION ${SALOME_INSTALL_PYTHON})
 SET(SCRIPTS
-  LifeCycleCORBA.py 
   TestLifeCycleCORBA.py 
 )
 SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libSALOME_LifeCycleCORBA.py DESTINATION ${SALOME_INSTALL_PYTHON})
+# /!\ Order of next 2 lines is important
+# because SALOME_INSTALL_SCRIPTS macro will compute the pyc/pyo files
+# and ${_swig_SCRIPTS} file needs LifeCycleCORBA.py
+SALOME_INSTALL_SCRIPTS(LifeCycleCORBA.py ${SALOME_INSTALL_PYTHON} DEF_PERMS)
+SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)

diff --git a/src/Logger/CMakeLists.txt b/src/Logger/CMakeLists.txt
index 5ce8117c2938cbf53a616e1573aa3ddc6a2276c7..d7c57863186da1c81a37b86fe7d1d1f633e5a417 100644 (file)
--- a/src/Logger/CMakeLists.txt
+++ b/src/Logger/CMakeLists.txt
@@ -75,9 +75,6 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(KernelLogger ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeLoggerServer)
 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}")
-
-# Executable scripts to be installed
-SALOME_INSTALL_SCRIPTS(SALOME_Trace.py ${SALOME_INSTALL_SCRIPT_PYTHON})
+install(FILES ${_swig_SCRIPTS} SALOME_Trace.py DESTINATION ${SALOME_INSTALL_PYTHON})
 
 INSTALL(FILES SALOME_Trace.hxx DESTINATION ${SALOME_INSTALL_HEADERS})

diff --git a/src/ModuleCatalog/CMakeLists.txt b/src/ModuleCatalog/CMakeLists.txt
index 5faab9543012f6a6595975243eeb03f74d185229..938365e9c7214622490c4858c2b7b4b722916359 100644 (file)
--- a/src/ModuleCatalog/CMakeLists.txt
+++ b/src/ModuleCatalog/CMakeLists.txt
@@ -86,7 +86,7 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(KernelModuleCatalog ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeCatalog SalomeKernelHelpers)
 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}")
+install(FILES ${_swig_SCRIPTS} DESTINATION ${SALOME_INSTALL_PYTHON})
 
 #
 

diff --git a/src/NamingService/CMakeLists.txt b/src/NamingService/CMakeLists.txt
index 4d7fd155f94763b2f4f0a134c08d6c1855c5de31..b3beed6e00da703b15bbd8ca0fc42cbf5a505f8b 100644 (file)
--- a/src/NamingService/CMakeLists.txt
+++ b/src/NamingService/CMakeLists.txt
@@ -45,6 +45,12 @@ SET(SalomeNS_SOURCES
   SALOME_Embedded_NamingService_Client.cxx
 )
 
+SET(PACKAGES
+  SALOME_NamingServicePy.py
+  SALOME_Embedded_NamingService_ClientPy.py
+  SALOME_Embedded_NamingService.py
+)
+
 ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 ADD_LIBRARY(SalomeNS ${SalomeNS_SOURCES})
 ADD_DEPENDENCIES(SalomeNS SalomeIDLKernel)
@@ -52,11 +58,6 @@ TARGET_LINK_LIBRARIES(SalomeNS OpUtil SalomeORB)
 
 INSTALL(TARGETS SalomeNS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-# Executable scripts to be installed
-SALOME_INSTALL_SCRIPTS(SALOME_NamingServicePy.py ${SALOME_INSTALL_SCRIPT_PYTHON})
-SALOME_INSTALL_SCRIPTS(SALOME_Embedded_NamingService_ClientPy.py ${SALOME_INSTALL_SCRIPT_PYTHON})
-SALOME_INSTALL_SCRIPTS(SALOME_Embedded_NamingService.py ${SALOME_INSTALL_SCRIPT_PYTHON})
-
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
 
@@ -77,4 +78,4 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(NamingService ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeNS)
 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}")
+install(FILES ${_swig_SCRIPTS} ${PACKAGES} DESTINATION ${SALOME_INSTALL_PYTHON})

diff --git a/src/SALOMEDS/CMakeLists.txt b/src/SALOMEDS/CMakeLists.txt
index 23c2afa53c24c0390032f97edb95b03387f7a8d7..3556e04a23dadda51cbac5d6f357a17b83c7b1d9 100644 (file)
--- a/src/SALOMEDS/CMakeLists.txt
+++ b/src/SALOMEDS/CMakeLists.txt
@@ -180,15 +180,12 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(KernelDS ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeDS SalomeKernelHelpers)
 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}")
+install(FILES ${_swig_SCRIPTS} SALOME_DriverPy.py DESTINATION ${SALOME_INSTALL_PYTHON})
 
 INSTALL(TARGETS SALOMEDS_Server SALOMEDS_Client
       EXPORT ${PROJECT_NAME}TargetGroup
       DESTINATION ${SALOME_INSTALL_BINS})
 
-# Executable scripts to be installed
-SALOME_INSTALL_SCRIPTS(SALOME_DriverPy.py ${SALOME_INSTALL_SCRIPT_PYTHON})
-
 SET(COMMON_HEADERS_HXX
   SALOMEDS_SComponentIterator_i.hxx
   SALOMEDS_StudyBuilder_i.hxx

diff --git a/src/SALOMESDS/CMakeLists.txt b/src/SALOMESDS/CMakeLists.txt
index 3a8940a19b4f4501e87bdbbcabd9dcaef17201bc..613a60928c7a4c99311349d929511caa0694bd3d 100644 (file)
--- a/src/SALOMESDS/CMakeLists.txt
+++ b/src/SALOMESDS/CMakeLists.txt
@@ -67,7 +67,7 @@ TARGET_LINK_LIBRARIES(SALOME_DataScopeServer SalomeSDS)
 ADD_EXECUTABLE(SALOME_DataScopeServer_SSL SALOME_DataScopeServer_SSL.cxx)
 TARGET_LINK_LIBRARIES(SALOME_DataScopeServer_SSL SalomeSDS)
 INSTALL(TARGETS SALOME_DataScopeServer SALOME_DataScopeServer_SSL DESTINATION ${SALOME_INSTALL_BINS})
-INSTALL(FILES SalomeSDSClt.py SALOMEWrappedStdType.py DESTINATION ${SALOME_INSTALL_BINS})
+INSTALL(FILES SalomeSDSClt.py SALOMEWrappedStdType.py DESTINATION ${SALOME_INSTALL_PYTHON})
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
 
@@ -90,4 +90,4 @@ ENDIF(${MACHINE} STREQUAL WINDOWS)
 SWIG_LINK_LIBRARIES(KernelSDS ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SalomeSDS)
 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}")
+install(FILES ${_swig_SCRIPTS} DESTINATION ${SALOME_INSTALL_PYTHON})

diff --git a/src/TestContainer/CMakeLists.txt b/src/TestContainer/CMakeLists.txt
index e78ca116eb7dfbfee4ee69599ee34d938e9a0739..47b129395319c4e1e175fda2c129a4fee5bbd7c3 100644 (file)
--- a/src/TestContainer/CMakeLists.txt
+++ b/src/TestContainer/CMakeLists.txt
@@ -70,8 +70,12 @@ INSTALL(TARGETS TestLogger TestContainer EXPORT ${PROJECT_NAME}TargetGroup DESTI
 
 # Executable scripts to be installed
 SET(SCRIPTS
-  SALOME_TestComponentPy.py
   TestComponentPy.py
   TestLogger.py
 )
 SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
+
+SET(PACKAGES
+  SALOME_TestComponentPy.py
+)
+INSTALL(FILES ${PACKAGES} DESTINATION ${SALOME_INSTALL_PYTHON})

diff --git a/src/Utils/CMakeLists.txt b/src/Utils/CMakeLists.txt
index 26f9560bb82de6519b82a0375589baa38b3b034f..4af645181df1c5c751f3e084fc67f13e14cc6c39 100644 (file)
--- a/src/Utils/CMakeLists.txt
+++ b/src/Utils/CMakeLists.txt
@@ -79,7 +79,7 @@ SET(COMMON_SCRIPTS
   Utils_Identity.py 
   SALOME_utilities.py
 )
-SALOME_INSTALL_SCRIPTS("${COMMON_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
+install(FILES ${COMMON_SCRIPTS} DESTINATION ${SALOME_INSTALL_PYTHON})
 
 ADD_LIBRARY(OpUtil ${OpUtil_SOURCES})
 TARGET_LINK_LIBRARIES(OpUtil ${COMMON_LIBS})