From 225bad027618e5febee9bb39b6a1c14d43fd01a4 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 19 Dec 2017 01:21:54 +0100 Subject: [PATCH] use find_program to find GMSH --- cmake/macros/macro_deal_ii_find_program.cmake | 30 +++++++++++++++++++ cmake/modules/FindGMSH.cmake | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 cmake/macros/macro_deal_ii_find_program.cmake diff --git a/cmake/macros/macro_deal_ii_find_program.cmake b/cmake/macros/macro_deal_ii_find_program.cmake new file mode 100644 index 0000000000..0f502d8f48 --- /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 d138494fee..5108d784d4 100644 --- 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 ) -- 2.39.5