From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Fri, 31 Jan 2014 09:00:28 +0000 (+0100)
Subject: Slightly improve FindF2c.cmake.
X-Git-Tag: v3_11_beta~99
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/45432e7506b09db099ebdd92de15557fdd4d9474?hp=2328d6d0b71ed92be2530507d88bad4186f602d6

Slightly improve FindF2c.cmake.

* print diagnostic message after each step
* use LD_LIBRARY_PATH as a hint to find libf2c.so
* use the location of libf2c.so as a hint to find f2c.h
---

diff --git a/buildtools/Cmake/Modules/FindF2c.cmake b/buildtools/Cmake/Modules/FindF2c.cmake
index 611e7655d0..4d22501fa4 100644
--- a/buildtools/Cmake/Modules/FindF2c.cmake
+++ b/buildtools/Cmake/Modules/FindF2c.cmake
@@ -1,7 +1,6 @@
-find_path(HAVE_F2C_H f2c.h
-  HINTS
-  $ENV{LD_LIBRARY_PATH}
-  PATH_SUFFIXES include/
+find_program(F2C_EXE
+  NAME f2c
+  PATH_SUFFIXES bin/
   PATHS
   /opt
   /opt/local
@@ -10,9 +9,17 @@ find_path(HAVE_F2C_H f2c.h
   /usr
   )
 
-find_program(F2C_EXE
+if(F2C_EXE)
+  message(STATUS "Looking for bin f2c - found: ${F2C_EXE}")
+else()
+  message(STATUS "Looking for bin f2c - not found (http://www.netlib.org/f2c/)")
+endif()
+
+find_library(HAVE_F2C_LIB
   NAME f2c
-  PATH_SUFFIXES bin/
+  HINTS
+  ENV LD_LIBRARY_PATH
+  PATH_SUFFIXES lib/
   PATHS
   /opt
   /opt/local
@@ -21,11 +28,17 @@ find_program(F2C_EXE
   /usr
   )
 
-find_library(HAVE_F2C_LIB
-  NAME f2c
+if(HAVE_F2C_LIB)
+  message(STATUS "Looking for lib f2c - found: ${HAVE_F2C_LIB}")
+else()
+  message(STATUS "Looking for lib f2c - not found")
+endif()
+
+get_filename_component(F2C_HINT ${HAVE_F2C_LIB} PATH)
+find_path(HAVE_F2C_H f2c.h
   HINTS
-  $ENV{LD_LIBRARY_PATH}
-  PATH_SUFFIXES lib/
+  ${F2C_HINT}/..
+  PATH_SUFFIXES include/
   PATHS
   /opt
   /opt/local
@@ -35,28 +48,13 @@ find_library(HAVE_F2C_LIB
   )
 
 if(HAVE_F2C_H)
-  set(HAVE_SMPI_F2C_H 1)
-endif()
-
-message(STATUS "Looking for f2c.h")
-if(HAVE_F2C_H)
-  message(STATUS "Looking for f2c.h - found")
+  message(STATUS "Looking for f2c.h - found: ${HAVE_F2C_H}")
 else()
   message(STATUS "Looking for f2c.h - not found")
 endif()
 
-message(STATUS "Looking for lib f2c")
-if(HAVE_F2C_LIB)
-  message(STATUS "Looking for lib f2c - found")
-else()
-  message(STATUS "Looking for lib f2c - not found")
-endif()
-
-message(STATUS "Looking for bin f2c")
-if(F2C_EXE)
-  message(STATUS "Found F2C: ${F2C_EXE}")
-else()
-  message(STATUS "Looking for bin f2c - not found (http://www.netlib.org/f2c/)")
+if(HAVE_F2C_H)
+  set(HAVE_SMPI_F2C_H 1)
 endif()
 
 mark_as_advanced(HAVE_F2C_H)