From bb18dea762b17105dc6215fe50ee3fce31cd7616 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 17 May 2024 07:16:06 -0600 Subject: [PATCH] updates the fox build since the directory now always exists (but may be empty) --- CMakeLists.txt | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc7cce6d..ff7046eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,23 +71,18 @@ add_subdirectory(streams) add_subdirectory(dshr) if(NOT DISABLE_FoX) - if(IS_DIRECTORY "${FOX_ROOT}") - message(STATUS "FoX library is already checked out!") - message(STATUS "FoX source dir: ${FOX_ROOT}") - else() - FetchContent_Declare(fox - GIT_REPOSITORY https://github.com/ESMCI/fox.git - GIT_TAG 4.1.2.1 - SOURCE_DIR ${FOX_ROOT} - BINARY_DIR ${FOX_ROOT}/.. - ) - FetchContent_GetProperties(fox) - if(NOT fox_POPULATED) - FetchContent_Populate(fox) - message(STATUS "FoX source dir: ${fox_SOURCE_DIR}") - message(STATUS "FoX binary dir: ${fox_BINARY_DIR}") - endif() - endif() + FetchContent_Declare(fox + GIT_REPOSITORY https://github.com/ESMCI/fox.git + GIT_TAG 4.1.2.1 + SOURCE_DIR ${FOX_ROOT} + BINARY_DIR ${FOX_ROOT}/.. + ) + FetchContent_GetProperties(fox) + if(NOT fox_POPULATED) + FetchContent_Populate(fox) + message(STATUS "FoX source dir: ${fox_SOURCE_DIR}") + message(STATUS "FoX binary dir: ${fox_BINARY_DIR}") + endif() add_subdirectory(fox) target_include_directories(streams PUBLIC $