From 6675cef74ea44f14ab2970f1278f1ee207d67b15 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Thu, 12 Dec 2024 21:56:08 +0100 Subject: [PATCH] cleaning variable name --- .github/workflows/linux_build_test.yml | 6 +++--- cmake/DAGMC_macros.cmake | 4 ++-- cmake/FindMOAB.cmake | 6 +++--- src/mcnp/CMakeLists.txt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml index 98202fe83..ca90b76ff 100644 --- a/.github/workflows/linux_build_test.yml +++ b/.github/workflows/linux_build_test.yml @@ -50,7 +50,7 @@ jobs: 5.4.1, 5.5.1, ] - ddl_deps : [ + pull_install_moab : [ off, ] geant4_version : [ @@ -66,7 +66,7 @@ jobs: compiler: gcc hdf5_version: 1.14.3 moab_version: 5.4.1 - ddl_deps: on + pull_install_moab: on geant4_version: off double_down_version: off @@ -99,7 +99,7 @@ jobs: cmake ../ \ -DMOAB_DIR=${moab_install_dir} \ -DBUILD_GEANT4=$([ "${{ matrix.geant4_version }}" != "off" ] && echo "ON" || echo "OFF") \ - -DDDL_INSTALL_DEPS=$([ "${{ matrix.ddl_deps }}" != "on" ] && echo "OFF" || echo "ON -DHDF5_ROOT=${hdf5_install_dir}") \ + -DPULL_INSTALL_MOAB=$([ "${{ matrix.pull_install_moab }}" != "on" ] && echo "OFF" || echo "ON -DHDF5_ROOT=${hdf5_install_dir}") \ -DGEANT4_DIR=${geant4_install_dir} \ -DBUILD_CI_TESTS=ON \ -DBUILD_MW_REG_TESTS=OFF \ diff --git a/cmake/DAGMC_macros.cmake b/cmake/DAGMC_macros.cmake index 3f3a54947..bd34eb1e4 100644 --- a/cmake/DAGMC_macros.cmake +++ b/cmake/DAGMC_macros.cmake @@ -73,7 +73,7 @@ macro (dagmc_setup_options) option(DOUBLE_DOWN "Enable ray tracing with Embree via double down" OFF) - option(DDL_INSTALL_DEPS "Enable automatic downloading of MOAB dependency" OFF) + option(PULL_INSTALL_MOAB "Enable automatic downloading of MOAB dependency" OFF) if (BUILD_ALL) set(BUILD_MCNP5 ON) @@ -256,7 +256,7 @@ macro (dagmc_install_library lib_name) LIBRARY DESTINATION ${INSTALL_LIB_DIR} PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}) # Required to ensure that MOAB is built before DAGMC and to properly link against MOAB - if(DDL_INSTALL_DEPS) + if(PULL_INSTALL_MOAB) add_dependencies(${lib_name}-shared MOAB) target_link_libraries(${lib_name}-shared PUBLIC ${MOAB_LIBRARY_DIRS}/libMOAB${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake index 233bf8f54..d5fcddc72 100644 --- a/cmake/FindMOAB.cmake +++ b/cmake/FindMOAB.cmake @@ -12,9 +12,9 @@ find_path(MOAB_CMAKE_CONFIG ) # First check if we are forcing the download of MOAB -if (DDL_INSTALL_DEPS) +if (PULL_INSTALL_MOAB) if(DAGMC_BUILD_STATIC_LIBS) - message(FATAL_ERROR "DDL_INSTALL_DEPS is ONLY compatible with shared libraries.") + message(FATAL_ERROR "PULL_INSTALL_MOAB is ONLY compatible with shared libraries.") endif() if(NOT MOAB_VERSION) set(MOAB_VERSION "5.5.1") @@ -84,7 +84,7 @@ message(STATUS "MOAB_LIBRARY_DIRS: ${MOAB_LIBRARY_DIRS}") message(STATUS "MOAB_LIBRARIES_SHARED: ${MOAB_LIBRARIES_SHARED}") message(STATUS "MOAB_LIBRARIES_STATIC: ${MOAB_LIBRARIES_STATIC}") -if(DDL_INSTALL_DEPS) +if(PULL_INSTALL_MOAB) message(STATUS "MOAB will be downloaded and built at make time") elseif (MOAB_INCLUDE_DIRS AND (MOAB_LIBRARIES_SHARED OR NOT BUILD_SHARED_LIBS) AND (MOAB_LIBRARIES_STATIC OR NOT BUILD_STATIC_LIBS)) diff --git a/src/mcnp/CMakeLists.txt b/src/mcnp/CMakeLists.txt index 7b4dd5f49..118d1e958 100644 --- a/src/mcnp/CMakeLists.txt +++ b/src/mcnp/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(mcnp_funcs OBJECT mcnp_funcs.cpp) message(STATUS "Building object library: meshtal_funcs") add_library(meshtal_funcs OBJECT meshtal_funcs.cpp) -if(DDL_INSTALL_DEPS) +if(PULL_INSTALL_MOAB) add_dependencies(mcnp_funcs MOAB) add_dependencies(meshtal_funcs MOAB) endif()