standardization of cmakization 2.

diff --git a/salome_adm/cmake_files/FindBOOST.cmake b/salome_adm/cmake_files/FindBOOST.cmake
index 6a213e0cc3d4e10a998c9237e1cb0d89733215eb..bd9ec077f320e82735d481d519d233391b64e6e0 100644 (file)
--- a/salome_adm/cmake_files/FindBOOST.cmake
+++ b/salome_adm/cmake_files/FindBOOST.cmake
@@ -153,10 +153,10 @@ ENDIF(BOOST_STATUS)
 IF(BOOST_STATUS)
   IF(WINDOWS)
     SET(BOOST_CPPFLAGS ${BOOST_CPPFLAGS} -DBOOST_DISABLE_ASSERTS)# to be removed
-    SET(BOOST_FLAGS -DBOOST_DISABLE_ASSERTS)
+    SET(BOOST_DEFINITIONS -DBOOST_DISABLE_ASSERTS)
     IF(BOOST_ENABLE_DLL)
       SET(BOOST_CPPFLAGS ${BOOST_CPPFLAGS} -DBOOST_ALL_DYN_LINK)# to be removed
-      SET(BOOST_FLAGS -DBOOST_ALL_DYN_LINK)
+      SET(BOOST_DEFINITIONS "${BOOST_DEFINITIONS} -DBOOST_ALL_DYN_LINK")
     ENDIF(BOOST_ENABLE_DLL)  
   ENDIF(WINDOWS)
 ELSE(BOOST_STATUS)

diff --git a/salome_adm/cmake_files/FindCPPUNIT.cmake b/salome_adm/cmake_files/FindCPPUNIT.cmake
index 82f8051da73147f1edcbcad14060319083a34fc8..4193644cd9ae3235f0966f111c200d939f80e641 100644 (file)
--- a/salome_adm/cmake_files/FindCPPUNIT.cmake
+++ b/salome_adm/cmake_files/FindCPPUNIT.cmake
@@ -135,10 +135,10 @@ ENDIF(CPPUNIT_STATUS)
 
 IF(CPPUNIT_STATUS)
   SET(CPPUNIT_IS_OK 1)
-  SET(CPPUNIT_FLAGS)
+  SET(CPPUNIT_DEFINITIONS)
   IF(WINDOWS)
     SET(CPPUNIT_INCLUDES ${CPPUNIT_INCLUDES} -DCPPUNIT_DLL)
-    SET(CPPUNIT_FLAGS "-DCPPUNIT_DLL")
+    SET(CPPUNIT_DEFINITIONS "-DCPPUNIT_DLL")
   ENDIF(WINDOWS)
 ELSE(CPPUNIT_STATUS)
   IF(CPPUNIT_IS_MANDATORY)

diff --git a/salome_adm/cmake_files/FindHDF5.cmake b/salome_adm/cmake_files/FindHDF5.cmake
index 476c16835c4e524d1cf180cbcb0dbcbb3e46096a..1ecd8a4971abdb3b635103b8d1c78a6e33b7ccff 100644 (file)
--- a/salome_adm/cmake_files/FindHDF5.cmake
+++ b/salome_adm/cmake_files/FindHDF5.cmake
@@ -110,7 +110,7 @@ IF(HDF5_STATUS)
        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_")
+    SET(HDF5_DEFINITIONS "-DH5_USE_16_API -D_HDF5USEDLL_")
     SET(HDF5_INCLUDES -DH5_USE_16_API -D_HDF5USEDLL_ ${HDF5_INCLUDES})# to be removed
     MESSAGE(STATUS "${HDF5_INCLUDE_TO_FIND} found in ${HDF5_INCLUDE_DIR}")
   ELSE(HDF5_INCLUDE_DIR)
@@ -175,7 +175,7 @@ IF(HDF5_STATUS)
     MESSAGE(STATUS "hdf5 is parallel")
     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_DEFINITIONS "${HDF5_DEFINITIONS} ${MPI_DEFINITIONS}")
     SET(HDF5_LIBS ${HDF5_LIBS} ${MPI_LIBS})
   ENDIF(HDF5_HAVE_PARALLEL)
 ENDIF(HDF5_STATUS)

diff --git a/salome_adm/cmake_files/FindLIBXML2.cmake b/salome_adm/cmake_files/FindLIBXML2.cmake
index 903255a7edd0c57aea0c533d0e000d8a3350be96..5eafb937db23de026bbef5c98682891f38e6878a 100644 (file)
--- a/salome_adm/cmake_files/FindLIBXML2.cmake
+++ b/salome_adm/cmake_files/FindLIBXML2.cmake
@@ -145,7 +145,7 @@ ENDIF(WINDOWS)
 IF(LIBXML2_STATUS)
   SET(LIBXML_INCLUDES ${LIBXML2_INCLUDES})# to remove
   SET(LIBXML_CPPFLAGS ${LIBXML2_INCLUDES})
-  SET(LIBXML_FLAGS)
+  SET(LIBXML_DEFINITIONS)
   SET(LIBXML_LIBS ${LIBXML2_LIBS})
 ELSE(LIBXML2_STATUS)
   IF(LIBXML2_IS_MANDATORY)

diff --git a/salome_adm/cmake_files/FindMPI.cmake b/salome_adm/cmake_files/FindMPI.cmake
index ddae3855580afaa1c3eb2765d4ac593fcf6113b4..8818c5fac4c118208eae8f68ae5c96fc86351fc4 100644 (file)
--- a/salome_adm/cmake_files/FindMPI.cmake
+++ b/salome_adm/cmake_files/FindMPI.cmake
@@ -105,19 +105,19 @@ IF(MPI_STATUS)
       IF(MPI_LIB_mpi_cxx AND MPI_LIB_mpi)
         SET(MPI_LIBS ${MPI_LIB_mpi_cxx} ${MPI_LIB_mpi})
         SET(MPI_INCLUDES ${MPI_INCLUDES} -DOMPI_IGNORE_CXX_SEEK)# to remove
-       SET(MPI_FLAGS -DOMPI_IGNORE_CXX_SEEK)
+       SET(MPI_DEFINITIONS -DOMPI_IGNORE_CXX_SEEK)
       ELSEIF(MPI_LIB_mpi_cxx)
         SET(MPI_LIBS ${MPI_LIB_mpi_cxx})
         SET(MPI_INCLUDES ${MPI_INCLUDES} -DOMPI_IGNORE_CXX_SEEK)# to remove
-       SET(MPI_FLAGS -DOMPI_IGNORE_CXX_SEEK)
+       SET(MPI_DEFINITIONS -DOMPI_IGNORE_CXX_SEEK)
       ELSEIF(MPI_LIB_mpi)
         SET(MPI_LIBS ${MPI_LIB_mpi})
         SET(MPI_INCLUDES ${MPI_INCLUDES} -DOMPI_IGNORE_CXX_SEEK)# to remove
-       SET(MPI_FLAGS -DOMPI_IGNORE_CXX_SEEK)
+       SET(MPI_DEFINITIONS -DOMPI_IGNORE_CXX_SEEK)
       ELSEIF(MPI_LIB_mpich)
         SET(MPI_LIBS ${MPI_LIB_mpich})
         SET(MPI_INCLUDES ${MPI_INCLUDES} -DMPICH_IGNORE_CXX_SEEK)# to remove
-       SET(MPI_FLAGS -DMPICH_IGNORE_CXX_SEEK)
+       SET(MPI_DEFINITIONS -DMPICH_IGNORE_CXX_SEEK)
       ENDIF()
     ELSE(MPI_LIB_FOUND)
       MESSAGE(STATUS "MPI lib not found, check your MPI installation.")
@@ -136,7 +136,7 @@ IF(MPI_STATUS)
   IF(MPI2_IS_OK)
     MESSAGE(STATUS "Your mpi implemtentation is compatible with mpi2 ... adding -DHAVE_MPI2")
     SET(MPI_INCLUDES ${MPI_INCLUDES} -DHAVE_MPI2)# to remove
-    SET(MPI_FLAGS "${MPI_FLAGS} -DHAVE_MPI2")
+    SET(MPI_DEFINITIONS "${MPI_DEFINITIONS} -DHAVE_MPI2")
   ENDIF(MPI2_IS_OK)
 ENDIF(MPI_STATUS)
 

diff --git a/salome_adm/cmake_files/FindOMNIORB.cmake b/salome_adm/cmake_files/FindOMNIORB.cmake
index d79b80a61e99296d7573302da5b949770fbc9474..df341c48d8a64fa3860c43e132684425c144dc75 100644 (file)
--- a/salome_adm/cmake_files/FindOMNIORB.cmake
+++ b/salome_adm/cmake_files/FindOMNIORB.cmake
@@ -150,9 +150,10 @@ IF(OMNIORB_STATUS)
   SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -D__x86__) # to be removed
   SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -DCOMP_CORBA_DOUBLE) # to be removed
   SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -DCOMP_CORBA_LONG) # to be removed
-  SET(OMNIORB_FLAGS "-D__x86__ -DCOMP_CORBA_DOUBLE -DCOMP_CORBA_LONG")
+  SET(OMNIORB_DEFINITIONS "-D__x86__ -DCOMP_CORBA_DOUBLE -DCOMP_CORBA_LONG")
   IF(WINDOWS)
-    SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -D__WIN32__)
+    SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -D__WIN32__) # to be removed
+    SET(OMNIORB_DEFINITIONS "${OMNIORB_DEFINITIONS} -D__WIN32__")
     #    #  #  # SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -D_WIN32_WINNT=0x0400)
     #    SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -D__NT__)
     #    SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -D__OSVERSION__=4)
@@ -223,8 +224,8 @@ IF(OMNIORB_STATUS)
   SET(CORBA_GEN 1)
   SET(OMNIORB_IDL ${OMNIIDL_EXECUTABLE})
   SET(CORBA_INCLUDES ${OMNIORB_INCLUDES})
-  SET(CORBA_CXXFLAGS ${OMNIORB_CXXFLAGS})
-  SET(CORBA_FLAGS ${OMNIORB_CXXFLAGS})
+  SET(CORBA_CXXFLAGS ${OMNIORB_CXXFLAGS})# to be removed
+  SET(CORBA_DEFINITIONS ${OMNIORB_DEFINITIONS})
   SET(CORBA_LIBS ${OMNIORB_LIBS})
   SET(OMNIORB_IDLCXXFLAGS -Wba -nf)
   SET(OMNIORB_IDLPYFLAGS -bpython)

diff --git a/salome_adm/cmake_files/FindPYTHON.cmake b/salome_adm/cmake_files/FindPYTHON.cmake
index 77b68da033ebe31c4f68c873c0411c1eb52764b0..df658fba494ada1a4bdd7a2be4e7cc97e71df820 100644 (file)
--- a/salome_adm/cmake_files/FindPYTHON.cmake
+++ b/salome_adm/cmake_files/FindPYTHON.cmake
@@ -142,7 +142,7 @@ IF(PYTHON_STATUS)
   ENDIF(PYTHON_ROOT_USER)
   SET(PYTHON_INCLUDE_TO_FIND Python.h)
   FIND_PATH(PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_TO_FIND} PATHS ${PYTHON_INCLUDE_PATHS} ${PYTHON_FIND_PATHS_OPTION})
-  SET(PYTHON_FLAGS)
+  SET(PYTHON_DEFINITIONS)
   IF(PYTHON_INCLUDE_DIR)
     SET(PYTHON_INCLUDES -I${PYTHON_INCLUDE_DIR})# to remove
     SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
@@ -150,7 +150,7 @@ IF(PYTHON_STATUS)
       IF(CMAKE_BUILD_TYPE STREQUAL Release)
       ELSE(CMAKE_BUILD_TYPE STREQUAL Release)
        SET(PYTHON_INCLUDES ${PYTHON_INCLUDES} -DHAVE_DEBUG_PYTHON)# to remove
-       SET(PYTHON_FLAGS "-DHAVE_DEBUG_PYTHON")
+       SET(PYTHON_DEFINITIONS "-DHAVE_DEBUG_PYTHON")
       ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
     ENDIF(WINDOWS)
     MESSAGE(STATUS "${PYTHON_INCLUDE_TO_FIND} found in ${PYTHON_INCLUDE_DIR}")
@@ -215,7 +215,7 @@ IF(PYTHON_STATUS)
   IF(NUMPY_STATUS)
     SET(PYTHON_INCLUDES ${PYTHON_INCLUDES} -DWITH_NUMPY -I${NUMPY_INCLUDE_DIR})# to remove
     SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR})
-    SET(PYTHON_FLAGS "${PYTHON_FLAGS} -DWITH_NUMPY")
+    SET(PYTHON_DEFINITIONS "${PYTHON_DEFINITIONS} -DWITH_NUMPY")
     MESSAGE(STATUS "numpy found : ${NUMPY_INCLUDE_DIR}")
   ELSE(NUMPY_STATUS)
     MESSAGE(STATUS "numpy not found")