From: ageay <ageay>
Date: Wed, 10 Jul 2013 08:00:45 +0000 (+0000)
Subject: KERNEL_ROOT_DIR/include/salome -> KERNEL_INCLUDE_DIRS
X-Git-Tag: B4KillOfAutomake~33
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cab567fe77709fc5c750e8c832308ed1c86adddb;p=modules%2Fmed.git

KERNEL_ROOT_DIR/include/salome -> KERNEL_INCLUDE_DIRS
---

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index b67ebe47b..15dee2d78 100644
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE(UseOmniORB)
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt
index de7d05497..73049d664 100644
--- a/src/MEDCalculator/CMakeLists.txt
+++ b/src/MEDCalculator/CMakeLists.txt
@@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES(
   ${HDF5_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader
diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt
index 25530c9c2..d71e3e223 100644
--- a/src/MEDCouplingCorba/CMakeLists.txt
+++ b/src/MEDCouplingCorba/CMakeLists.txt
@@ -28,7 +28,7 @@ ENDIF(SALOME_BUILD_TESTS)
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
diff --git a/src/MEDCouplingCorba/Client/CMakeLists.txt b/src/MEDCouplingCorba/Client/CMakeLists.txt
index c8cf5b133..f087e1b37 100644
--- a/src/MEDCouplingCorba/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba/Client/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL
diff --git a/src/MEDCouplingCorba/Test/CMakeLists.txt b/src/MEDCouplingCorba/Test/CMakeLists.txt
index 8e1639034..4b5cc8fae 100644
--- a/src/MEDCouplingCorba/Test/CMakeLists.txt
+++ b/src/MEDCouplingCorba/Test/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
   ${CPPUNIT_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../Client
diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt
index 0ab95cd7a..43a43d654 100644
--- a/src/MEDCouplingCorba_Swig/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(MEDCouplingCorba_SWIG_DPYS_FILES
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba
diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
index 7fd745e17..069729242 100644
--- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
@@ -30,7 +30,7 @@ ENDIF(NUMPY_FOUND)
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCouplingCorba/Client
diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt
index 5f77106cf..1eade37d6 100644
--- a/src/MEDGUI/CMakeLists.txt
+++ b/src/MEDGUI/CMakeLists.txt
@@ -42,8 +42,8 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${BOOST_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
-  ${GUI_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
+  ${GUI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_BINARY_DIR}/../..
diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDOP/gui/CMakeLists.txt
index a87be7865..c3bd78f1f 100644
--- a/src/MEDOP/gui/CMakeLists.txt
+++ b/src/MEDOP/gui/CMakeLists.txt
@@ -46,8 +46,8 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${BOOST_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
-  ${GUI_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
+  ${GUI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
   ${CMAKE_CURRENT_BINARY_DIR}/dialogs
diff --git a/src/MEDOP/gui/dialogs/CMakeLists.txt b/src/MEDOP/gui/dialogs/CMakeLists.txt
index 9d0d1fd54..fbbc6ac45 100644
--- a/src/MEDOP/gui/dialogs/CMakeLists.txt
+++ b/src/MEDOP/gui/dialogs/CMakeLists.txt
@@ -59,8 +59,8 @@ INCLUDE_DIRECTORIES(
   ${BOOST_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${KERNEL_ROOT_DIR}/include/salome
-  ${GUI_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
+  ${GUI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${QT4_INCLUDE_DIRECTORY}
 )
diff --git a/src/ParaMEDCouplingCorba/CMakeLists.txt b/src/ParaMEDCouplingCorba/CMakeLists.txt
index 4d3871538..3221c59b9 100644
--- a/src/ParaMEDCouplingCorba/CMakeLists.txt
+++ b/src/ParaMEDCouplingCorba/CMakeLists.txt
@@ -20,7 +20,7 @@
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${MPI_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
diff --git a/src/ParaMEDMEMComponent/CMakeLists.txt b/src/ParaMEDMEMComponent/CMakeLists.txt
index 914810cd7..1caba462e 100644
--- a/src/ParaMEDMEMComponent/CMakeLists.txt
+++ b/src/ParaMEDMEMComponent/CMakeLists.txt
@@ -22,7 +22,7 @@ ADD_DEFINITIONS(${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${MPI_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDCouplingCorba