From: Renaud Barate <renaud.barate@edf.fr>
Date: Thu, 11 Jul 2013 14:51:04 +0000 (+0200)
Subject: Use standard Salome variables for installation directories
X-Git-Tag: V7_3_0~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2844ee98877e9656d91d8a3dc4bd1ff41199d532;p=modules%2Fparametric.git

Use standard Salome variables for installation directories
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3109a10..4b6739f 100644
--- 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 1fe1fad..fa2a547 100644
--- 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 e847362..d338efb 100644
--- 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 1a4ed15..347573c 100644
--- 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 82cb703..ce5030c 100644
--- 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 53b1839..5333f9b 100644
--- 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 7213b4d..603de22 100644
--- 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})