cmakeization standardization.

diff --git a/salome_adm/cmake_files/FindBOOST.cmake b/salome_adm/cmake_files/FindBOOST.cmake
index 63f0240ad119bdcb39a53a8ed14958ee87bb3779..6a213e0cc3d4e10a998c9237e1cb0d89733215eb 100644 (file)
--- a/salome_adm/cmake_files/FindBOOST.cmake
+++ b/salome_adm/cmake_files/FindBOOST.cmake
@@ -83,7 +83,7 @@ IF(BOOST_STATUS)
   IF(BOOST_INCLUDE_DIR)
     IF(BOOST_ROOT_USER)
       SET(BOOST_CPPFLAGS -I${BOOST_INCLUDE_DIR})# to be removed
-      SET(BOOST_INCLUDES_DIR ${BOOST_INCLUDE_DIR})
+      SET(BOOST_INCLUDE_DIRS ${BOOST_INCLUDE_DIR})
     ENDIF(BOOST_ROOT_USER)
     MESSAGE(STATUS "${BOOST_INCLUDE_TO_FIND} found in ${BOOST_INCLUDE_DIR}")
   ELSE(BOOST_INCLUDE_DIR)

diff --git a/salome_adm/cmake_files/FindCPPUNIT.cmake b/salome_adm/cmake_files/FindCPPUNIT.cmake
index c609c0bfa5b8f61034a5daeffcf041bb279e5b47..82f8051da73147f1edcbcad14060319083a34fc8 100644 (file)
--- a/salome_adm/cmake_files/FindCPPUNIT.cmake
+++ b/salome_adm/cmake_files/FindCPPUNIT.cmake
@@ -81,9 +81,9 @@ IF(CPPUNIT_STATUS)
     IF(CPPUNIT_ROOT_USER)
       SET(CPPUNIT_INCLUDES -I${CPPUNIT_INCLUDE_DIR})# to be removed
       IF(${CPPUNIT_INCLUDE_DIR} STREQUAL /usr/include)
-       SET(CPPUNIT_INCLUDES_DIR)
+       SET(CPPUNIT_INCLUDE_DIRS)
       ELSE(${CPPUNIT_INCLUDE_DIR} STREQUAL /usr/include)
-       SET(CPPUNIT_INCLUDES_DIR ${CPPUNIT_INCLUDE_DIR})
+       SET(CPPUNIT_INCLUDE_DIRS ${CPPUNIT_INCLUDE_DIR})
       ENDIF(${CPPUNIT_INCLUDE_DIR} STREQUAL /usr/include)
     ENDIF(CPPUNIT_ROOT_USER)
     MESSAGE(STATUS "${CPPUNIT_INCLUDE_TO_FIND} found in ${CPPUNIT_INCLUDE_DIR}")

diff --git a/salome_adm/cmake_files/FindHDF5.cmake b/salome_adm/cmake_files/FindHDF5.cmake
index 040df24c71e312dd6ede3ff02ffa23b381a3c9b8..476c16835c4e524d1cf180cbcb0dbcbb3e46096a 100644 (file)
--- a/salome_adm/cmake_files/FindHDF5.cmake
+++ b/salome_adm/cmake_files/FindHDF5.cmake
@@ -105,9 +105,9 @@ IF(HDF5_STATUS)
     IF(HDF5_ROOT_USER)
       SET(HDF5_INCLUDES -I${HDF5_INCLUDE_DIR})# to be removed
       IF(${HDF5_INCLUDE_DIR} STREQUAL /usr/include)
-       SET(HDF5_INCLUDES_DIR)
+       SET(HDF5_INCLUDE_DIRS)
       ELSE(${HDF5_INCLUDE_DIR} STREQUAL /usr/include)
-       SET(HDF5_INCLUDES_DIR ${HDF5_INCLUDE_DIR})
+       SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR})
       ENDIF(${HDF5_INCLUDE_DIR} STREQUAL /usr/include)
     ENDIF(HDF5_ROOT_USER)
     SET(HDF5_FLAGS "-DH5_USE_16_API -D_HDF5USEDLL_")
@@ -173,8 +173,8 @@ IF(HDF5_STATUS)
     )
   IF(HDF5_HAVE_PARALLEL)
     MESSAGE(STATUS "hdf5 is parallel")
-    SET(HDF5_INCLUDES ${HDF5_INCLUDES} -I${MPI_INCLUDES_DIR})       # to remove after "cmakeization"
-    SET(HDF5_INCLUDES_DIR ${HDF5_INCLUDES_DIR} ${MPI_INCLUDES_DIR})
+    SET(HDF5_INCLUDES ${HDF5_INCLUDES} -I${MPI_INCLUDE_DIRS})       # to remove after "cmakeization"
+    SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS} ${MPI_INCLUDE_DIRS})
     SET(HDF5_FLAGS "${HDF5_FLAGS} ${MPI_FLAGS}")
     SET(HDF5_LIBS ${HDF5_LIBS} ${MPI_LIBS})
   ENDIF(HDF5_HAVE_PARALLEL)

diff --git a/salome_adm/cmake_files/FindKERNEL.cmake b/salome_adm/cmake_files/FindKERNEL.cmake
index 33bd9fce4fb6ef246f5e83aa2f5f66e4e7e2f1df..5354a76241d63f8962844ce7cfcb9c896f1481d5 100644 (file)
--- a/salome_adm/cmake_files/FindKERNEL.cmake
+++ b/salome_adm/cmake_files/FindKERNEL.cmake
@@ -21,7 +21,7 @@
 #
 
 SET(KERNEL_CXXFLAGS -I${KERNEL_ROOT_DIR}/include/salome) # to be removed
-SET(KERNEL_INCLUDES_DIR ${KERNEL_ROOT_DIR}/include/salome)
+SET(KERNEL_INCLUDE_DIRS ${KERNEL_ROOT_DIR}/include/salome)
 
 FIND_LIBRARY(CalciumC CalciumC ${KERNEL_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(DF DF ${KERNEL_ROOT_DIR}/lib/salome)

diff --git a/salome_adm/cmake_files/FindLIBXML2.cmake b/salome_adm/cmake_files/FindLIBXML2.cmake
index fbab1c35c0890a85144e52fb44e7fe36396e4785..903255a7edd0c57aea0c533d0e000d8a3350be96 100644 (file)
--- a/salome_adm/cmake_files/FindLIBXML2.cmake
+++ b/salome_adm/cmake_files/FindLIBXML2.cmake
@@ -86,7 +86,7 @@ IF(LIBXML2_STATUS)
   FIND_PATH(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_TO_FIND} PATHS ${LIBXML2_INCLUDE_PATHS} ${LIBXML2_FIND_PATHS_OPTION})
   IF(LIBXML2_INCLUDE_DIR)
     SET(LIBXML2_INCLUDES -I${LIBXML2_INCLUDE_DIR})# to remove
-    SET(LIBXML_INCLUDES_DIR ${LIBXML2_INCLUDE_DIR})
+    SET(LIBXML_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR})
     MESSAGE(STATUS "${LIBXML2_INCLUDE_TO_FIND} found in ${LIBXML2_INCLUDE_DIR}")
   ELSE(LIBXML2_INCLUDE_DIR)
     SET(LIBXML2_STATUS 0)
@@ -136,7 +136,7 @@ IF(WINDOWS)
     FIND_PATH(ICONV_INCLUDE_DIR iconv.h ${ICONV_ROOT}/include)
     FIND_LIBRARY(ICONV_LIBS iconv ${ICONV_ROOT}/lib)
     SET(LIBXML2_INCLUDES ${LIBXML2_INCLUDES} -I${ICONV_INCLUDE_DIR})# to remove
-    SET(LIBXML_INCLUDES_DIR ${LIBXML2_INCLUDES_DIR} ${ICONV_INCLUDE_DIR})
+    SET(LIBXML_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIRS} ${ICONV_INCLUDE_DIR})
     SET(LIBXML2_LIBS ${LIBXML2_LIBS} ${ICONV_LIBS})
   ENDIF(ICONV_ROOT)
 ENDIF(WINDOWS)

diff --git a/salome_adm/cmake_files/FindMPI.cmake b/salome_adm/cmake_files/FindMPI.cmake
index 3cee9539eac2f112a61ba006f7749ac30a515ac6..ddae3855580afaa1c3eb2765d4ac593fcf6113b4 100644 (file)
--- a/salome_adm/cmake_files/FindMPI.cmake
+++ b/salome_adm/cmake_files/FindMPI.cmake
@@ -85,7 +85,7 @@ IF(MPI_STATUS)
   MESSAGE(STATUS "MPI include ${MPI_INCLUDE_TO_FIND} found in ${MPI_INCLUDES}")
 
   SET(MPI_INCLUDE_DIR ${MPI_INCLUDES})
-  SET(MPI_INCLUDES_DIR ${MPI_INCLUDES})
+  SET(MPI_INCLUDE_DIRS ${MPI_INCLUDES})
   SET(MPI_INCLUDES -I${MPI_INCLUDES})# to remove
   
   # ------

diff --git a/salome_adm/cmake_files/FindOMNIORB.cmake b/salome_adm/cmake_files/FindOMNIORB.cmake
index b990bb4dfe55332c61b77ff78804c0837f5e7993..d79b80a61e99296d7573302da5b949770fbc9474 100644 (file)
--- a/salome_adm/cmake_files/FindOMNIORB.cmake
+++ b/salome_adm/cmake_files/FindOMNIORB.cmake
@@ -101,7 +101,7 @@ ENDIF(OMNIORB_STATUS)
 
 IF(OMNIORB_STATUS)
   SET(OMNIORB_INCLUDES) # to be removed
-  SET(OMNIORB_INCLUDES_DIR)
+  SET(OMNIORB_INCLUDE_DIRS)
 ENDIF(OMNIORB_STATUS)
 IF(OMNIORB_STATUS)
   IF(OMNIORB_ROOT_USER)
@@ -113,7 +113,7 @@ IF(OMNIORB_STATUS)
   FIND_PATH(OMNIORB_INCLUDE_DIR1 ${OMNIORB_INCLUDE_TO_FIND} PATHS ${OMNIORB_INCLUDE_PATHS} ${OMNIORB_FIND_PATHS_OPTION})
   IF(OMNIORB_INCLUDE_DIR1)
     SET(OMNIORB_INCLUDES ${OMNIORB_INCLUDES} -I${OMNIORB_INCLUDE_DIR1}) # to be removed
-    SET(OMNIORB_INCLUDES_DIR ${OMNIORB_INCLUDE_DIR1})
+    SET(OMNIORB_INCLUDE_DIRS ${OMNIORB_INCLUDE_DIR1})
     MESSAGE(STATUS "${OMNIORB_INCLUDE_TO_FIND} found in ${OMNIORB_INCLUDE_DIR1}")
   ELSE(OMNIORB_INCLUDE_DIR1)
     SET(OMNIORB_STATUS 0)
@@ -134,7 +134,7 @@ IF(OMNIORB_STATUS)
   FIND_PATH(OMNIORB_INCLUDE_DIR2 ${OMNIORB_INCLUDE_TO_FIND} PATHS ${OMNIORB_INCLUDE_PATHS} ${OMNIORB_FIND_PATHS_OPTION})
   IF(OMNIORB_INCLUDE_DIR2)
     SET(OMNIORB_INCLUDES ${OMNIORB_INCLUDES} -I${OMNIORB_INCLUDE_DIR2}) # to be removed
-    SET(OMNIORB_INCLUDES_DIR ${OMNIORB_INCLUDES_DIR} ${OMNIORB_INCLUDE_DIR2})
+    SET(OMNIORB_INCLUDE_DIRS ${OMNIORB_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR2})
     MESSAGE(STATUS "${OMNIORB_INCLUDE_TO_FIND} found in ${OMNIORB_INCLUDE_DIR2}")
   ELSE(OMNIORB_INCLUDE_DIR2)
     SET(OMNIORB_STATUS 0)

diff --git a/salome_adm/cmake_files/FindPYTHON.cmake b/salome_adm/cmake_files/FindPYTHON.cmake
index d12cf51ec9068944528c433e72e7edfd48b34e24..77b68da033ebe31c4f68c873c0411c1eb52764b0 100644 (file)
--- a/salome_adm/cmake_files/FindPYTHON.cmake
+++ b/salome_adm/cmake_files/FindPYTHON.cmake
@@ -145,7 +145,7 @@ IF(PYTHON_STATUS)
   SET(PYTHON_FLAGS)
   IF(PYTHON_INCLUDE_DIR)
     SET(PYTHON_INCLUDES -I${PYTHON_INCLUDE_DIR})# to remove
-    SET(PYTHON_INCLUDES_DIR ${PYTHON_INCLUDE_DIR})
+    SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
     IF(WINDOWS)
       IF(CMAKE_BUILD_TYPE STREQUAL Release)
       ELSE(CMAKE_BUILD_TYPE STREQUAL Release)
@@ -214,7 +214,7 @@ IF(PYTHON_STATUS)
   ENDIF(NUMPY_INCLUDE_DIR)
   IF(NUMPY_STATUS)
     SET(PYTHON_INCLUDES ${PYTHON_INCLUDES} -DWITH_NUMPY -I${NUMPY_INCLUDE_DIR})# to remove
-    SET(PYTHON_INCLUDES_DIR ${PYTHON_INCLUDES_DIR} ${NUMPY_INCLUDE_DIR})
+    SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR})
     SET(PYTHON_FLAGS "${PYTHON_FLAGS} -DWITH_NUMPY")
     MESSAGE(STATUS "numpy found : ${NUMPY_INCLUDE_DIR}")
   ELSE(NUMPY_STATUS)