From 12e70e89664cd4b8c60be2c734b908207f79e3db Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 25 Jul 2019 08:54:23 -0700 Subject: [PATCH] Use LaTeX detection from ESMA_cmake v1.0.9 This now defines a good LATEX_FOUND variable that helps on machines that don't have a complete LaTeX stack (e.g., NAS compute) --- Externals.cfg | 2 +- GMAO_pFIO/CMakeLists.txt | 3 +-- MAPL_Base/CMakeLists.txt | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index b9e32a74bd6b..c6393d61e23c 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -2,7 +2,7 @@ required = True repo_url = git@github.com:GEOS-ESM/ESMA_cmake.git local_path = ./@cmake -tag = v1.0.2 +tag = v1.0.9 externals = Externals.cfg protocol = git diff --git a/GMAO_pFIO/CMakeLists.txt b/GMAO_pFIO/CMakeLists.txt index d6d7701890a8..1c4bc59e933f 100644 --- a/GMAO_pFIO/CMakeLists.txt +++ b/GMAO_pFIO/CMakeLists.txt @@ -118,8 +118,7 @@ include_directories (${INC_NETCDF}) file (COPY unused_dummy.H DESTINATION ${include_${this}}) # Users guide -if ($ENV{USE_LATEX} MATCHES NO) -else () +if (LATEX_FOUND) # add_subdirectory (TeX) endif () diff --git a/MAPL_Base/CMakeLists.txt b/MAPL_Base/CMakeLists.txt index 60f8a25f9ed9..1889831da9e3 100644 --- a/MAPL_Base/CMakeLists.txt +++ b/MAPL_Base/CMakeLists.txt @@ -106,8 +106,7 @@ file (COPY mapl_acg.pl DESTINATION ${esma_include}/${this}) file (COPY mapl_stub.pl DESTINATION ${esma_include}/${this}) # Users guide -if ($ENV{USE_LATEX} MATCHES NO) -else () +if (LATEX_FOUND) add_subdirectory (TeX) endif ()