Merge from V6_main 13/12/2012

[modules/med.git] / adm_local / cmake_files / FindMEDFILE.cmake

diff --git a/adm_local/cmake_files/FindMEDFILE.cmake b/adm_local/cmake_files/FindMEDFILE.cmake
index 615e1b4567d6bf8d1ce46cff7878e96447a63e7e..ee79ff1ca674f9862ef5a725754bae45770279be 100644 (file)
--- a/adm_local/cmake_files/FindMEDFILE.cmake
+++ b/adm_local/cmake_files/FindMEDFILE.cmake
@@ -76,19 +76,26 @@ FOREACH(name medC)
   ENDIF(MED_ENABLE_MED3)
 ENDFOREACH(name medC)
 
-SET(MED3_LIBS ${MED3_LIBS_C_ONLY})
-FOREACH(name med medimport)
-  IF(MED_ENABLE_MED3)
-    FIND_LIBRARY(${name}_LIB ${name} ${MED3HOME}/lib)
-    IF(${name}_LIB)
-      MESSAGE(STATUS "${name} lib found: ${${name}_LIB}")
-      SET(MED3_LIBS ${MED3_LIBS} ${${name}_LIB})
-    ELSE(${name}_LIB)
-      MESSAGE(STATUS "${name} lib not found in ${MED3HOME}/lib, check your installation.")
-      SET(MED_ENABLE_MED3 OFF)
-    ENDIF(${name}_LIB)
-  ENDIF(MED_ENABLE_MED3)
-ENDFOREACH(name med medimport)
+SET(MED3_HAS_FORTRAN_BINDINGS 0)
+IF(MED_ENABLE_MED3)
+  FIND_LIBRARY(med_LIB med ${MED3HOME}/lib)
+  IF(med_LIB)
+    MESSAGE(STATUS "med lib found: ${med_LIB}")
+    SET(MED3_LIBS ${MED3_LIBS_C_ONLY} ${med_LIB})
+    SET(MED3_HAS_FORTRAN_BINDINGS 1)
+  ELSE(med_LIB)
+    MESSAGE(STATUS "med lib not found in ${MED3HOME}/lib")
+  ENDIF(med_LIB)
+
+  FIND_LIBRARY(medimport_LIB medimport ${MED3HOME}/lib)
+  IF(medimport_LIB)
+    MESSAGE(STATUS "medimport lib found: ${medimport_LIB}")
+    SET(MED3_LIBS ${MED3_LIBS} ${medimport_LIB})
+  ELSE(medimport_LIB)
+    MESSAGE(STATUS "medimport lib not found in ${MED3HOME}/lib")
+    SET(MED3_HAS_FORTRAN_BINDINGS 0)
+  ENDIF(medimport_LIB)
+ENDIF(MED_ENABLE_MED3)
 
 IF(MED_ENABLE_MED3)
 ELSE(MED_ENABLE_MED3)