From d946597b1ee8b1e5d5ffd5467a922ce80b648630 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 21 Aug 2013 07:04:03 +0000 Subject: [PATCH] CMake build procedure improvements: - minor general improvements --- src/DSC/DSC_Python/CMakeLists.txt | 4 ++-- src/KERNEL_PY/kernel/CMakeLists.txt | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/DSC/DSC_Python/CMakeLists.txt b/src/DSC/DSC_Python/CMakeLists.txt index 3479662ca..9d803f1b8 100755 --- a/src/DSC/DSC_Python/CMakeLists.txt +++ b/src/DSC/DSC_Python/CMakeLists.txt @@ -61,6 +61,6 @@ INSTALL(TARGETS _calcium DESTINATION ${SALOME_INSTALL_PYTHON}) SET(SCRIPTS dsccalcium.py + ${CMAKE_CURRENT_BINARY_DIR}/calcium.py ) -SALOME_INSTALL_SCRIPTS( ${SCRIPTS} ${SALOME_INSTALL_PYTHON}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/calcium.py DESTINATION ${SALOME_INSTALL_PYTHON}) +SALOME_INSTALL_SCRIPTS( "${SCRIPTS}" ${SALOME_INSTALL_PYTHON}) diff --git a/src/KERNEL_PY/kernel/CMakeLists.txt b/src/KERNEL_PY/kernel/CMakeLists.txt index ec20d0ecd..2ad955890 100755 --- a/src/KERNEL_PY/kernel/CMakeLists.txt +++ b/src/KERNEL_PY/kernel/CMakeLists.txt @@ -40,10 +40,9 @@ SET(mypkgpython_PYTHON syshelper.py ) # This set of modules required a running SALOME application. -SET(mypkgpython_PYTHON - ${mypkgpython_PYTHON} +LIST(APPEND mypkgpython_PYTHON studyedit.py services.py + ${CMAKE_CURRENT_BINARY_DIR}/logconfig.py ) SALOME_INSTALL_SCRIPTS("${mypkgpython_PYTHON}" ${SALOME_INSTALL_PYTHON}/salome/kernel) -SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/logconfig.py ${SALOME_INSTALL_PYTHON}/salome/kernel) \ No newline at end of file -- 2.39.2