Debug and clean-up build procedure: continue

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf062dd4d5ec299de482c40ddff76fd66f5c4ee8..996fdaa267e083056ba0de1c5dcdde686c702b8a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,6 +117,8 @@ IF(EXISTS ${SHAPER_ROOT_DIR})
   SET_AND_CHECK(SHAPER_INCLUDE_DIRS "${SHAPER_ROOT_DIR}/include/salome")
   INCLUDE_DIRECTORIES(${SHAPER_INCLUDE_DIRS})
   find_library(LIB_XAOShaper NAMES XAOShaper PATHS ${SHAPER_ROOT_DIR}/lib/salome)
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${SHAPER_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/salome)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${SHAPER_ROOT_DIR}/lib/salome) 
 ELSE(EXISTS ${SHAPER_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome SHAPER, please define SHAPER_ROOT_DIR")
 ENDIF(EXISTS ${SHAPER_ROOT_DIR})
@@ -134,7 +136,8 @@ SET(SALOME_INSTALL_IDLS           "${SALOME_INSTALL_IDLS}"           CACHE PATH
 SET(SALOME_INSTALL_HEADERS        "${SALOME_INSTALL_HEADERS}"        CACHE PATH "Install path: SALOME headers")
 SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH "Install path: SALOME scripts")
 SET(SALOME_INSTALL_SCRIPT_DATA    "${SALOME_INSTALL_SCRIPT_DATA}"    CACHE PATH "Install path: SALOME script data")
-SET(SALOME_INSTALL_SCRIPT_PYTHON  "${SALOME_INSTALL_SCRIPT_PYTHON}"  CACHE PATH "Install path: SALOME Python scripts")
+SET(SALOME_INSTALL_SCRIPT_PYTHON  "${SALOME_INSTALL_SCRIPT_PYTHON}"  CACHE PATH "Install path: SALOME Python executable scripts")
+SET(SALOME_INSTALL_PYTHON         "${SALOME_INSTALL_PYTHON}"         CACHE PATH "Install path: SALOME Python import modules")
 SET(SALOME_INSTALL_CMAKE_LOCAL    "${SALOME_INSTALL_CMAKE_LOCAL}"    CACHE PATH "Install path: SALOME CMake files")
 SET(SALOME_INSTALL_RES            "${SALOME_INSTALL_RES}"            CACHE PATH "Install path: SALOME resources")
 SET(SALOME_INSTALL_DOC            "${SALOME_INSTALL_DOC}"            CACHE PATH "Install path: SALOME documentation")
@@ -144,12 +147,12 @@ SET(SALOME_SHAPERSTUDY_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/shaperstudy" CACH
    
 MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS)
 MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON)
-MARK_AS_ADVANCED(SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_DOC)
+MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_DOC)
 MARK_AS_ADVANCED(SALOME_SHAPERSTUDY_INSTALL_RES_DATA)
 
 # Accumulate environment variables for SHAPERSTUDY module
 SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
-                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_SCRIPT_PYTHON})
+                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
 SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
 
 # Sources 

diff --git a/SalomeSHAPERSTUDYConfig.cmake.in b/SalomeSHAPERSTUDYConfig.cmake.in
index 9fb91690429504c1033ab09cbe5e0c340600d0b8..b1f70ad7c5540627d7eefd9c8aa4fbbb00c5264a 100644 (file)
--- a/SalomeSHAPERSTUDYConfig.cmake.in
+++ b/SalomeSHAPERSTUDYConfig.cmake.in
@@ -34,7 +34,7 @@
 # (contains definitions for IMPORTED targets). This is only 
 # imported if we are not built as a subproject (in this case targets are already there)
 IF(NOT TARGET SalomeIDLSHAPERSTUDY AND NOT @PROJECT_NAME@_BINARY_DIR)
-  INCLUDE("${SHAPERSTUDY_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeSHAPERSTUDYTargets.cmake")
+  INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake")
 ENDIF()   
 
 # Package root dir:

diff --git a/src/PY/CMakeLists.txt b/src/PY/CMakeLists.txt
index 1c0e04deb19f983c41429da98662684bdabf74c1..b2597092c48363c4f9f9251971a371ce509b3fa9 100644 (file)
--- a/src/PY/CMakeLists.txt
+++ b/src/PY/CMakeLists.txt
@@ -30,4 +30,4 @@ SET(_bin_SCRIPTS
 )
 
 # --- rules ---
-SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
\ No newline at end of file
+SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON})
\ No newline at end of file