use find_program to find GMSH

diff --git a/cmake/macros/macro_deal_ii_find_program.cmake b/cmake/macros/macro_deal_ii_find_program.cmake
new file mode 100644 (file)
index 0000000..0f502d8
--- /dev/null
+++ b/cmake/macros/macro_deal_ii_find_program.cmake
@@ -0,0 +1,30 @@
+## ---------------------------------------------------------------------
+##
+## Copyright (C) 2017 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE at
+## the top level of the deal.II distribution.
+##
+## ---------------------------------------------------------------------
+
+#
+# A small wrapper around FIND_PROGRAM to be a bit more verbose
+#
+
+MACRO(DEAL_II_FIND_PROGRAM _file_name)
+  FIND_PROGRAM(${_file_name} ${ARGN})
+
+  IF(${_file_name} MATCHES "-NOTFOUND")
+    MESSAGE(STATUS "${_file_name} not found! Call:")
+    TO_STRING(_str ${ARGN})
+    MESSAGE(STATUS "    FIND_PROGRAM(${_file_name} ${_str})")
+  ELSE()
+    MESSAGE(STATUS "Found ${_file_name}")
+  ENDIF()
+ENDMACRO()

diff --git a/cmake/modules/FindGMSH.cmake b/cmake/modules/FindGMSH.cmake
index d138494feee049517dc68b83bc95dc3b08e16029..5108d784d4b3ee89d669f089017777bab58e25d1 100644 (file)
--- a/cmake/modules/FindGMSH.cmake
+++ b/cmake/modules/FindGMSH.cmake
@@ -24,7 +24,7 @@
 SET(GMSH_DIR "" CACHE PATH "An optional hint to a GMSH installation containing the gmsh executable")
 SET_IF_EMPTY(GMSH_DIR "$ENV{GMSH_DIR}")
 
-DEAL_II_FIND_FILE(GMSH_EXE gmsh${CMAKE_EXECUTABLE_SUFFIX}
+DEAL_II_FIND_PROGRAM(GMSH_EXE gmsh${CMAKE_EXECUTABLE_SUFFIX}
   HINTS ${GMSH_DIR}
   PATH_SUFFIXES bin
   )