Skip to content

Commit

Permalink
adressing @gonuke comments
Browse files Browse the repository at this point in the history
  • Loading branch information
bam241 committed Jan 13, 2025
1 parent 445aab9 commit e56cfd3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,12 @@ endif()

# Dealing with MOAB
if (PULL_INSTALL_MOAB)
# Ensure MOAB_VERSION
if(not MOAB_VERSION)
set(MOAB_VERSION "5.5.1")
endif()
include(MOAB_PullAndMake)
moab_pull_make()
moab_pull_make(${MOAB_VERSION})
else()
find_package(MOAB REQUIRED)
endif()
Expand Down
2 changes: 2 additions & 0 deletions cmake/FindMOAB.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This leverage HDF5_macro.cmake in order to find HDF5 libraries.

message("")

# Find MOAB cmake config file
Expand Down
9 changes: 2 additions & 7 deletions cmake/MOAB_PullAndMake.cmake
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
# This Macro sets up the download and build of MOAB using ExternalProject
# few tweak are done in src/dagmc/CMakeLists.txt and src/PyNE/CMakeists.txt
# to make sure that MOAB is built before DAGMC.
MACRO (moab_pull_make)
MACRO (moab_pull_make MOAB_Version)
MESSAGE(STATUS "MOAB will be downloaded and built")

# Ensure STATIC LIBS Build
IF(DAGMC_BUILD_STATIC_LIBS)
MESSAGE(FATAL_ERROR "PULL_INSTALL_MOAB is ONLY compatible with shared libraries.")
endIF()

# Ensure MOAB_VERSION
IF(NOT MOAB_VERSION)
SET(MOAB_VERSION "5.5.1")
endIF()


# Ensure we have the right variables to build MOAB
moab_autobuild_check_deps()

Expand Down

0 comments on commit e56cfd3

Please sign in to comment.