Cmakization of MED.

diff --git a/salome_adm/cmake_files/FindKERNEL.cmake b/salome_adm/cmake_files/FindKERNEL.cmake
index a4fbbd9939b89536ad027819dc656d11f5092313..a1cb946f92f0724adeeaa106a3b749a507e1fec0 100644 (file)
--- a/salome_adm/cmake_files/FindKERNEL.cmake
+++ b/salome_adm/cmake_files/FindKERNEL.cmake
@@ -20,7 +20,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SET(KERNEL_CXXFLAGS -I${KERNEL_ROOT_DIR}/include/salome)
+SET(KERNEL_CXXFLAGS -I${KERNEL_ROOT_DIR}/include/salome) # to be removed
+SET(KERNEL_INCLUDES_DIR ${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/FindOMNIORB.cmake b/salome_adm/cmake_files/FindOMNIORB.cmake
index eb71a9d048dda74b9e4af1380d46caedb6d197ce..789e36ede019e4fcabc3a93f4af57a1a9220422f 100644 (file)
--- a/salome_adm/cmake_files/FindOMNIORB.cmake
+++ b/salome_adm/cmake_files/FindOMNIORB.cmake
@@ -100,7 +100,8 @@ ENDIF(OMNIORB_STATUS)
 # ------
 
 IF(OMNIORB_STATUS)
-  SET(OMNIORB_INCLUDES)
+  SET(OMNIORB_INCLUDES) # to be removed
+  SET(OMNIORB_INCLUDES_DIR)
 ENDIF(OMNIORB_STATUS)
 IF(OMNIORB_STATUS)
   IF(OMNIORB_ROOT_USER)
@@ -111,7 +112,8 @@ IF(OMNIORB_STATUS)
   SET(OMNIORB_INCLUDE_TO_FIND omniORB4/CORBA.h)
   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})
+    SET(OMNIORB_INCLUDES ${OMNIORB_INCLUDES} -I${OMNIORB_INCLUDE_DIR1}) # to be removed
+    SET(OMNIORB_INCLUDES_DIR ${OMNIORB_INCLUDE_DIR1})
     MESSAGE(STATUS "${OMNIORB_INCLUDE_TO_FIND} found in ${OMNIORB_INCLUDE_DIR1}")
   ELSE(OMNIORB_INCLUDE_DIR1)
     SET(OMNIORB_STATUS 0)
@@ -131,7 +133,8 @@ IF(OMNIORB_STATUS)
   SET(OMNIORB_INCLUDE_TO_FIND CORBA.h)
   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})
+    SET(OMNIORB_INCLUDES ${OMNIORB_INCLUDES} -I${OMNIORB_INCLUDE_DIR2}) # to be removed
+    SET(OMNIORB_INCLUDES_DIR ${OMNIORB_INCLUDES_DIR} ${OMNIORB_INCLUDE_DIR2})
     MESSAGE(STATUS "${OMNIORB_INCLUDE_TO_FIND} found in ${OMNIORB_INCLUDE_DIR2}")
   ELSE(OMNIORB_INCLUDE_DIR2)
     SET(OMNIORB_STATUS 0)
@@ -142,11 +145,12 @@ ENDIF(OMNIORB_STATUS)
 # ------
 
 IF(OMNIORB_STATUS)
-  SET(OMNIORB_CXXFLAGS)
+  SET(OMNIORB_CXXFLAGS) # to be removed
   # SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -DOMNIORB_VERSION=4)
-  SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -D__x86__)
-  SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -DCOMP_CORBA_DOUBLE)
-  SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -DCOMP_CORBA_LONG)
+  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")
   IF(WINDOWS)
     SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -D__WIN32__)
     #    #  #  # SET(OMNIORB_CXXFLAGS ${OMNIORB_CXXFLAGS} -D_WIN32_WINNT=0x0400)
@@ -220,6 +224,7 @@ IF(OMNIORB_STATUS)
   SET(OMNIORB_IDL ${OMNIIDL_EXECUTABLE})
   SET(CORBA_INCLUDES ${OMNIORB_INCLUDES})
   SET(CORBA_CXXFLAGS ${OMNIORB_CXXFLAGS})
+  SET(CORBA_FLAGS ${OMNIORB_CXXFLAGS})
   SET(CORBA_LIBS ${OMNIORB_LIBS})
   SET(OMNIORB_IDLCXXFLAGS -Wba -nf)
   SET(OMNIORB_IDLPYFLAGS -bpython)