Use standard Salome variables for installation directories

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3109a107f6a3be14377a9510b4c279dd8c57c18c..4b6739f9ffdbd219aadf9cfe5f6d70556823c6a0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,10 +44,7 @@ IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeSphinx REQUIRED)
 ENDIF()
 
-SET(BINDIR bin/salome)
-SET(RESDIR share/salome/resources/parametric)
-SET(LIBDIR lib/salome)
-SET(PYTHONDIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/salome)
+SET(RESDIR ${SALOME_INSTALL_RES}/parametric)
 SET(DOCDIR share/doc/salome/gui/PARAMETRIC)
 
 ADD_SUBDIRECTORY(idl)

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 1fe1fad991cb1aeb30c3983ba51ba73a0a5229af..fa2a547eaab2b66cf1b9216d6f169a73fca9c541 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -30,4 +30,4 @@ OMNIORB_ADD_MODULE(SalomeIDLPARAMETRIC "${PARAMETRIC_IDL_FILES}" "${IDL_INCLUDE_
 TARGET_LINK_LIBRARIES(SalomeIDLPARAMETRIC ${OMNIORB_LIBRARIES} ${KERNEL_LDFLAGS} ${SalomeIDLKernel})
 SET_TARGET_PROPERTIES(SalomeIDLPARAMETRIC PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
 
-INSTALL(TARGETS SalomeIDLPARAMETRIC DESTINATION ${LIBDIR})
+INSTALL(TARGETS SalomeIDLPARAMETRIC DESTINATION ${SALOME_INSTALL_LIBS})

diff --git a/src/PARAMETRIC/CMakeLists.txt b/src/PARAMETRIC/CMakeLists.txt
index e84736200cc54b619fb08448e26a049099002418..d338efbae98bf87c6d17f1b239a041d5011ceb91 100644 (file)
--- a/src/PARAMETRIC/CMakeLists.txt
+++ b/src/PARAMETRIC/CMakeLists.txt
@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with SALOME PARAMETRIC module.  If not, see <http://www.gnu.org/licenses/>.
 
-INSTALL_AND_COMPILE_PYTHON_FILE(PARAMETRIC.py ${BINDIR})
+INSTALL_AND_COMPILE_PYTHON_FILE(PARAMETRIC.py ${SALOME_INSTALL_PYTHON})

diff --git a/src/PARAMETRICGUI/CMakeLists.txt b/src/PARAMETRICGUI/CMakeLists.txt
index 1a4ed15c7ec133e3da20d4882b20c0320e72d001..347573c680432b69301f150d221641e34c341fe2 100644 (file)
--- a/src/PARAMETRICGUI/CMakeLists.txt
+++ b/src/PARAMETRICGUI/CMakeLists.txt
@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with SALOME PARAMETRIC module.  If not, see <http://www.gnu.org/licenses/>.
 
-INSTALL_AND_COMPILE_PYTHON_FILE(PARAMETRICGUI.py ${BINDIR})
+INSTALL_AND_COMPILE_PYTHON_FILE(PARAMETRICGUI.py ${SALOME_INSTALL_PYTHON})

diff --git a/src/salome/CMakeLists.txt b/src/salome/CMakeLists.txt
index 82cb70308054292892362d2f494e797be714ecfc..ce5030cd60e5729d6d46da03099aeeabd9938fbe 100644 (file)
--- a/src/salome/CMakeLists.txt
+++ b/src/salome/CMakeLists.txt
@@ -21,4 +21,4 @@ SET(PYTHON_FILES
   __init__.py
 )
 
-INSTALL_AND_COMPILE_PYTHON_FILE("${PYTHON_FILES}" ${PYTHONDIR}/salome)
+INSTALL_AND_COMPILE_PYTHON_FILE("${PYTHON_FILES}" ${SALOME_INSTALL_PYTHON}/salome)

diff --git a/src/salome/parametric/CMakeLists.txt b/src/salome/parametric/CMakeLists.txt
index 53b183945d51808333276ced32d9322e58c5975f..5333f9bd8ba8d0f9d2fc300af16734c102afd283 100644 (file)
--- a/src/salome/parametric/CMakeLists.txt
+++ b/src/salome/parametric/CMakeLists.txt
@@ -24,4 +24,4 @@ SET(PYTHON_FILES
   study.py
 )
 
-INSTALL_AND_COMPILE_PYTHON_FILE("${PYTHON_FILES}" ${PYTHONDIR}/salome/parametric)
+INSTALL_AND_COMPILE_PYTHON_FILE("${PYTHON_FILES}" ${SALOME_INSTALL_PYTHON}/salome/parametric)

diff --git a/src/salome/parametric/gui/CMakeLists.txt b/src/salome/parametric/gui/CMakeLists.txt
index 7213b4da3a2b77982e7986a35a2b8353d426a72c..603de2253e5a65bf5680881eb8b80e0fc7b46cae 100644 (file)
--- a/src/salome/parametric/gui/CMakeLists.txt
+++ b/src/salome/parametric/gui/CMakeLists.txt
@@ -25,7 +25,7 @@ SET(PYTHON_FILES
   wizard.py
 )
 SET(PYUIC_FILES wizard_ui.py varrange_ui.py execparams_ui.py genjob_ui.py definevalues_ui.py)
-SET(INSTALL_DIR ${PYTHONDIR}/salome/parametric/gui)
+SET(INSTALL_DIR ${SALOME_INSTALL_PYTHON}/salome/parametric/gui)
 
 FOREACH(OUTPUT ${PYUIC_FILES})
   STRING(REPLACE "_ui.py" ".ui" INPUT ${OUTPUT})