From 0e9adea01c20f2b9b27af76a5b53418df975855f Mon Sep 17 00:00:00 2001 From: ageay Date: Thu, 7 Jun 2012 14:27:17 +0000 Subject: [PATCH] cmakeization standardization. --- salome_adm/cmake_files/FindBOOST.cmake | 2 +- salome_adm/cmake_files/FindCPPUNIT.cmake | 4 ++-- salome_adm/cmake_files/FindHDF5.cmake | 8 ++++---- salome_adm/cmake_files/FindKERNEL.cmake | 2 +- salome_adm/cmake_files/FindLIBXML2.cmake | 4 ++-- salome_adm/cmake_files/FindMPI.cmake | 2 +- salome_adm/cmake_files/FindOMNIORB.cmake | 6 +++--- salome_adm/cmake_files/FindPYTHON.cmake | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/salome_adm/cmake_files/FindBOOST.cmake b/salome_adm/cmake_files/FindBOOST.cmake index 63f0240ad..6a213e0cc 100644 --- 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 c609c0bfa..82f8051da 100644 --- 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 040df24c7..476c16835 100644 --- 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 33bd9fce4..5354a7624 100644 --- 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 fbab1c35c..903255a7e 100644 --- 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 3cee9539e..ddae38555 100644 --- 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 b990bb4df..d79b80a61 100644 --- 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 d12cf51ec..77b68da03 100644 --- 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) -- 2.39.2