From 99222f6d046da82710bfa8e9e9859d13fbd1f4d2 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Tue, 3 Dec 2024 15:39:59 +0100
Subject: [PATCH 1/7] first attempt to auto-install MOAB

change location

cmake up

cmake up

cmake up

CMAKE_MODULE_PATH

CMAKE_MODULE_PATH

CMAKE_MODULE_PATH

adding LIBS

adding LIBS

install_dependent_library(MOAB )

install_dependent_library

adding LIBS

adding LIBS

adding LIBS

adding LIBS

adding LIBS

adding LIBS

adding LIBS

adding LIBS

instal_prefix

instal_prefix

instal_prefix

instal_prefix

instal_prefix

instal_prefix

instal_prefix

instal_prefix

instal_prefix

instal_prefix

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

INTERFACE

tmp

get the safeguard

revert unnecessary change
---
 CMakeLists.txt           |  2 +-
 cmake/FindMOAB.cmake     | 51 +++++++++++++++++++++++++++++++++++++---
 src/dagmc/CMakeLists.txt |  4 ++++
 src/pyne/CMakeLists.txt  |  3 +++
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ab2034a1a..3ba74aff9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(DAGMC)
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.18)
 enable_language(CXX)
 
 # Set DAGMC version
diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake
index 92602c8917..6a860e5e32 100644
--- a/cmake/FindMOAB.cmake
+++ b/cmake/FindMOAB.cmake
@@ -13,12 +13,57 @@ find_path(MOAB_CMAKE_CONFIG
 if (MOAB_CMAKE_CONFIG)
   set(MOAB_CMAKE_CONFIG ${MOAB_CMAKE_CONFIG}/MOABConfig.cmake)
   message(STATUS "MOAB_CMAKE_CONFIG: ${MOAB_CMAKE_CONFIG}")
+  include(${MOAB_CMAKE_CONFIG})
+elseif (DDL_INSTALL_DEPS)
+  message(STATUS "MOAB will be downloaded and built")
+  include(ExternalProject)
+  # Configure MOAB
+  if(NOT MOAB_VERSION)
+    set(MOAB_VERSION "5.5.1")
+  endif()
+  set(CMAKE_INSTALL_LIBDIR "lib")
+  SET(MOAB_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/moab")
+  set(MOAB_ROOT "${CMAKE_BINARY_DIR}/moab")
+  set(MOAB_INCLUDE_DIRS "${MOAB_INSTALL_PREFIX}/include")
+  set(MOAB_LIBRARY_DIRS "${MOAB_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+  set(MOAB_LIBRARIES_SHARED "")
+  ExternalProject_Add(MOAB_ep
+    PREFIX ${MOAB_ROOT}   
+    GIT_REPOSITORY https://bitbucket.org/fathomteam/moab.git
+    GIT_TAG ${MOAB_VERSION}
+    CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+      -DBUILD_SHARED_LIBS:BOOL=ON
+      -DENABLE_HDF5:BOOL=ON
+      -DHDF5_ROOT:PATH=${HDF5_ROOT}
+      -DEIGEN3_DIR:PATH=${EIGEN3_INCLUDE_DIRS}
+      -DENABLE_BLASLAPACK:BOOL=OFF
+      -DENABLE_FORTRAN:BOOL=OFF
+      -DCMAKE_MACOSX_RPATH:BOOL=ON
+    DOWNLOAD_EXTRACT_TIMESTAMP true
+    BUILD_BYPRODUCTS "${MOAB_LIBRARY_DIRS}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
+    # Set devel space as install prefix
+    INSTALL_DIR "${MOAB_INSTALL_PREFIX}"
+  )
+  add_library(MOAB INTERFACE)
+  # list(APPEND CMAKE_MODULE_PATH ${MOAB_LIBRARY_DIRS}/cmake)
+  message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}") 
+  message(STATUS "MOAB_LIBRARY_DIRS=${MOAB_LIBRARY_DIRS}") 
+  message(STATUS "MOAB_LIBRARY_DIRS=${MOAB_LIBRARY_DIRS}")
+  target_include_directories(MOAB SYSTEM INTERFACE ${MOAB_INCLUDE_DIRS})
+  target_link_libraries(MOAB INTERFACE ${MOAB_INSTALL_PREFIX}/lib64/libMOAB.so)
+  add_dependencies(MOAB MOAB_ep)
+  install(TARGETS MOAB LIBRARY DESTINATION ${MOAB_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+                      PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR})
+
+  include_directories(${MOAB_INCLUDE_DIRS})
+  link_directories(${MOAB_LIBRARY_DIRS})
+  include_directories(${EIGEN3_INCLUDE_DIRS})
 else ()
   message(FATAL_ERROR "Could not find MOAB. Set -DMOAB_DIR=<MOAB_DIR> when running cmake or use the $MOAB_DIR environment variable.")
 endif ()
 
 # Find HDF5
-include(${MOAB_CMAKE_CONFIG})
 set(ENV{PATH} "${HDF5_DIR}:$ENV{PATH}")
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
 find_package(HDF5 REQUIRED)
@@ -74,8 +119,8 @@ message(STATUS "MOAB_LIBRARIES_STATIC: ${MOAB_LIBRARIES_STATIC}")
 if (MOAB_INCLUDE_DIRS AND (MOAB_LIBRARIES_SHARED OR NOT BUILD_SHARED_LIBS) AND
     (MOAB_LIBRARIES_STATIC OR NOT BUILD_STATIC_LIBS))
   message(STATUS "Found MOAB")
-else ()
-  message(FATAL_ERROR "Could not find MOAB")
+else()
+  # message(FATAL_ERROR "Could not find MOAB")
 endif ()
 
 include_directories(${MOAB_INCLUDE_DIRS})
diff --git a/src/dagmc/CMakeLists.txt b/src/dagmc/CMakeLists.txt
index 2fbc05161a..4bc24b2860 100644
--- a/src/dagmc/CMakeLists.txt
+++ b/src/dagmc/CMakeLists.txt
@@ -14,6 +14,10 @@ include_directories(${CMAKE_BINARY_DIR}/src/dagmc)
 
 dagmc_install_library(dagmc)
 
+if(DDL_INSTALL_DEPS)
+  add_dependencies(dagmc-shared MOAB)
+  target_link_libraries(dagmc-shared PUBLIC ${MOAB_INSTALL_PREFIX}/lib64/libMOAB.so)
+endif()
 add_subdirectory(tools)
 
 if (BUILD_TESTS)
diff --git a/src/pyne/CMakeLists.txt b/src/pyne/CMakeLists.txt
index 910c4df542..9fa181a2c6 100644
--- a/src/pyne/CMakeLists.txt
+++ b/src/pyne/CMakeLists.txt
@@ -34,3 +34,6 @@ if(NOT (${HDF5_VERSION} VERSION_LESS 1.12.0))
  endif()
 
 dagmc_install_library(pyne_dagmc)
+if(DDL_INSTALL_DEPS)
+  add_dependencies(pyne_dagmc-shared MOAB)
+endif()

From fa05e1108c656d7b7238c179b23d707e4b03b0a5 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:54:50 +0100
Subject: [PATCH 2/7] Update cmake/FindMOAB.cmake

Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
---
 cmake/FindMOAB.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake
index 6a860e5e32..8511cdd7df 100644
--- a/cmake/FindMOAB.cmake
+++ b/cmake/FindMOAB.cmake
@@ -15,11 +15,11 @@ if (MOAB_CMAKE_CONFIG)
   message(STATUS "MOAB_CMAKE_CONFIG: ${MOAB_CMAKE_CONFIG}")
   include(${MOAB_CMAKE_CONFIG})
 elseif (DDL_INSTALL_DEPS)
-  message(STATUS "MOAB will be downloaded and built")
   include(ExternalProject)
-  # Configure MOAB
+   # Configure MOAB
   if(NOT MOAB_VERSION)
     set(MOAB_VERSION "5.5.1")
+  message(STATUS "MOAB version ${MOAB_VERSION} will be downloaded and built")
   endif()
   set(CMAKE_INSTALL_LIBDIR "lib")
   SET(MOAB_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/moab")

From 21343f9406d3fcf276487732caa0a0fc352cfbe0 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com>
Date: Thu, 5 Dec 2024 12:02:56 +0100
Subject: [PATCH 3/7] Update cmake/FindMOAB.cmake

Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
---
 cmake/FindMOAB.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake
index 8511cdd7df..5cf215cc0b 100644
--- a/cmake/FindMOAB.cmake
+++ b/cmake/FindMOAB.cmake
@@ -19,8 +19,9 @@ elseif (DDL_INSTALL_DEPS)
    # Configure MOAB
   if(NOT MOAB_VERSION)
     set(MOAB_VERSION "5.5.1")
-  message(STATUS "MOAB version ${MOAB_VERSION} will be downloaded and built")
   endif()
+  message(STATUS "MOAB version ${MOAB_VERSION} will be downloaded and built")
+
   set(CMAKE_INSTALL_LIBDIR "lib")
   SET(MOAB_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/moab")
   set(MOAB_ROOT "${CMAKE_BINARY_DIR}/moab")

From 45feb896d00f6da51b24d3105b643c76a0671893 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 6 Dec 2024 12:32:14 +0100
Subject: [PATCH 4/7] reformating + changelog + tests

---
 .github/workflows/linux_build_test.yml | 12 +++++
 CMakeLists.txt                         |  2 +-
 cmake/DAGMC_macros.cmake               |  5 ++
 cmake/FindMOAB.cmake                   | 71 ++++++++------------------
 cmake/MOAB_PullAndMake.cmake           | 44 ++++++++++++++++
 doc/CHANGELOG.rst                      |  1 +
 src/dagmc/CMakeLists.txt               |  4 --
 src/mcnp/CMakeLists.txt                |  5 ++
 src/pyne/CMakeLists.txt                |  3 --
 9 files changed, 88 insertions(+), 59 deletions(-)
 create mode 100644 cmake/MOAB_PullAndMake.cmake

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 2aaf9ec298..98202fe83f 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -50,6 +50,9 @@ jobs:
           5.4.1,
           5.5.1,
         ]
+        ddl_deps : [
+          off,
+        ]
         geant4_version : [
           10.7.4,
           11.1.2
@@ -58,6 +61,14 @@ jobs:
           off,
           v1.1.0,
         ]
+        include:
+          - ubuntu_version: 22.04
+            compiler: gcc
+            hdf5_version: 1.14.3
+            moab_version: 5.4.1
+            ddl_deps: on
+            geant4_version: off
+            double_down_version: off
 
     container:
       image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{
@@ -88,6 +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}") \
               -DGEANT4_DIR=${geant4_install_dir} \
               -DBUILD_CI_TESTS=ON \
               -DBUILD_MW_REG_TESTS=OFF \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ba74aff9b..3ab2034a1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(DAGMC)
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.1)
 enable_language(CXX)
 
 # Set DAGMC version
diff --git a/cmake/DAGMC_macros.cmake b/cmake/DAGMC_macros.cmake
index d5b2cd04e9..d8373d2c4b 100644
--- a/cmake/DAGMC_macros.cmake
+++ b/cmake/DAGMC_macros.cmake
@@ -253,6 +253,11 @@ macro (dagmc_install_library lib_name)
             EXPORT DAGMCTargets
             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)
+      add_dependencies(${lib_name}-shared MOAB)
+      target_link_libraries(${lib_name}-shared PUBLIC ${MOAB_LIBRARY_DIRS}/libMOAB.so)
+    endif()
   endif ()
 
   if (BUILD_STATIC_LIBS)
diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake
index 5cf215cc0b..5497f650ce 100644
--- a/cmake/FindMOAB.cmake
+++ b/cmake/FindMOAB.cmake
@@ -10,61 +10,28 @@ find_path(MOAB_CMAKE_CONFIG
   PATHS ${MOAB_SEARCH_DIRS}
   NO_DEFAULT_PATH
 )
-if (MOAB_CMAKE_CONFIG)
-  set(MOAB_CMAKE_CONFIG ${MOAB_CMAKE_CONFIG}/MOABConfig.cmake)
-  message(STATUS "MOAB_CMAKE_CONFIG: ${MOAB_CMAKE_CONFIG}")
-  include(${MOAB_CMAKE_CONFIG})
-elseif (DDL_INSTALL_DEPS)
-  include(ExternalProject)
-   # Configure MOAB
-  if(NOT MOAB_VERSION)
-    set(MOAB_VERSION "5.5.1")
-  endif()
-  message(STATUS "MOAB version ${MOAB_VERSION} will be downloaded and built")
 
-  set(CMAKE_INSTALL_LIBDIR "lib")
-  SET(MOAB_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/moab")
-  set(MOAB_ROOT "${CMAKE_BINARY_DIR}/moab")
-  set(MOAB_INCLUDE_DIRS "${MOAB_INSTALL_PREFIX}/include")
-  set(MOAB_LIBRARY_DIRS "${MOAB_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-  set(MOAB_LIBRARIES_SHARED "")
-  ExternalProject_Add(MOAB_ep
-    PREFIX ${MOAB_ROOT}   
-    GIT_REPOSITORY https://bitbucket.org/fathomteam/moab.git
-    GIT_TAG ${MOAB_VERSION}
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-      -DBUILD_SHARED_LIBS:BOOL=ON
-      -DENABLE_HDF5:BOOL=ON
-      -DHDF5_ROOT:PATH=${HDF5_ROOT}
-      -DEIGEN3_DIR:PATH=${EIGEN3_INCLUDE_DIRS}
-      -DENABLE_BLASLAPACK:BOOL=OFF
-      -DENABLE_FORTRAN:BOOL=OFF
-      -DCMAKE_MACOSX_RPATH:BOOL=ON
-    DOWNLOAD_EXTRACT_TIMESTAMP true
-    BUILD_BYPRODUCTS "${MOAB_LIBRARY_DIRS}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
-    # Set devel space as install prefix
-    INSTALL_DIR "${MOAB_INSTALL_PREFIX}"
-  )
-  add_library(MOAB INTERFACE)
-  # list(APPEND CMAKE_MODULE_PATH ${MOAB_LIBRARY_DIRS}/cmake)
-  message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}") 
-  message(STATUS "MOAB_LIBRARY_DIRS=${MOAB_LIBRARY_DIRS}") 
-  message(STATUS "MOAB_LIBRARY_DIRS=${MOAB_LIBRARY_DIRS}")
-  target_include_directories(MOAB SYSTEM INTERFACE ${MOAB_INCLUDE_DIRS})
-  target_link_libraries(MOAB INTERFACE ${MOAB_INSTALL_PREFIX}/lib64/libMOAB.so)
-  add_dependencies(MOAB MOAB_ep)
-  install(TARGETS MOAB LIBRARY DESTINATION ${MOAB_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-                      PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR})
+# First check if we are forcing the download of MOAB
+if (DDL_INSTALL_DEPS)
+  IF(DAGMC_BUILD_STATIC_LIBS)
+    message(FATAL_ERROR "DDL_INSTALL_DEPS is ONLY compatible with shared libraries.")
+  ENDIF()
+  IF(NOT MOAB_VERSION)
+    SET(MOAB_VERSION "5.5.1")
+  ENDIF()
+  include(MOAB_PullAndMake)
+  moab_pull_make(${MOAB_VERSION})
 
-  include_directories(${MOAB_INCLUDE_DIRS})
-  link_directories(${MOAB_LIBRARY_DIRS})
-  include_directories(${EIGEN3_INCLUDE_DIRS})
+# Back to normal behavior
+elseif (MOAB_CMAKE_CONFIG)
+  set(MOAB_CMAKE_CONFIG ${MOAB_CMAKE_CONFIG}/MOABConfig.cmake)
+  message(STATUS "MOAB_CMAKE_CONFIG: ${MOAB_CMAKE_CONFIG}")
 else ()
   message(FATAL_ERROR "Could not find MOAB. Set -DMOAB_DIR=<MOAB_DIR> when running cmake or use the $MOAB_DIR environment variable.")
 endif ()
 
 # Find HDF5
+include(${MOAB_CMAKE_CONFIG})
 set(ENV{PATH} "${HDF5_DIR}:$ENV{PATH}")
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
 find_package(HDF5 REQUIRED)
@@ -117,11 +84,13 @@ 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 (MOAB_INCLUDE_DIRS AND (MOAB_LIBRARIES_SHARED OR NOT BUILD_SHARED_LIBS) AND
+if(DDL_INSTALL_DEPS)
+  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))
   message(STATUS "Found MOAB")
-else()
-  # message(FATAL_ERROR "Could not find MOAB")
+else ()
+  message(FATAL_ERROR "Could not find MOAB")
 endif ()
 
 include_directories(${MOAB_INCLUDE_DIRS})
diff --git a/cmake/MOAB_PullAndMake.cmake b/cmake/MOAB_PullAndMake.cmake
new file mode 100644
index 0000000000..e068c718bb
--- /dev/null
+++ b/cmake/MOAB_PullAndMake.cmake
@@ -0,0 +1,44 @@
+# this Macro sets up the download and build of MOAB using ExternalProject
+# few tweak are done in src/dagmc/CMakeLists.txt and src/PyNE/CMakelists.txt 
+# to make sure that MOAB is built before DAGMC.
+MACRO (moab_pull_make moab_version)
+    message(STATUS "MOAB will be downloaded and built")
+    include(ExternalProject)
+    message("HDF5_ROOT: ${HDF5_ROOT}")
+    SET(MOAB_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/moab")
+    set(MOAB_ROOT "${CMAKE_BINARY_DIR}/moab")
+    set(MOAB_INCLUDE_DIRS "${MOAB_INSTALL_PREFIX}/include")
+    set(MOAB_LIBRARY_DIRS "${MOAB_INSTALL_PREFIX}/lib")
+    message("MOAB_LIBRARY_DIRS: ${MOAB_LIBRARY_DIRS}")
+    set(MOAB_LIBRARIES_SHARED "")
+    ExternalProject_Add(MOAB_ep
+      PREFIX ${MOAB_ROOT}   
+      GIT_REPOSITORY https://bitbucket.org/fathomteam/moab.git
+      GIT_TAG ${moab_version}
+      CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DBUILD_SHARED_LIBS:BOOL=ON
+        -DENABLE_HDF5:BOOL=ON
+        -DHDF5_ROOT:PATH=${HDF5_ROOT}
+        -DCMAKE_INSTALL_RPATH=${HDF5_ROOT}/lib:${MOAB_INSTALL_PREFIX}/lib
+        -DENABLE_BLASLAPACK:BOOL=OFF
+        -DENABLE_FORTRAN:BOOL=OFF
+        -DENABLE_PYMOAB:BOOL=OFF 
+      DOWNLOAD_EXTRACT_TIMESTAMP true
+      BUILD_BYPRODUCTS "${MOAB_LIBRARY_DIRS}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
+      INSTALL_DIR "${MOAB_INSTALL_PREFIX}"
+    )
+    # Setup a interface library for MOAB based on ExternalProoject MOAB_EP
+    add_library(MOAB INTERFACE)
+
+    target_include_directories(MOAB SYSTEM INTERFACE ${MOAB_INCLUDE_DIRS})
+    target_link_libraries(MOAB INTERFACE ${MOAB_LIBRARY_DIRS}/libMOAB.so)
+    add_dependencies(MOAB MOAB_ep)
+    install(TARGETS MOAB LIBRARY DESTINATION ${MOAB_LIBRARY_DIRS}
+                        PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR})
+    include_directories(${MOAB_INCLUDE_DIRS})
+    link_directories(${MOAB_LIBRARY_DIRS})
+    find_package(Eigen3 REQUIRED NO_MODULE)
+    include_directories(${EIGEN3_INCLUDE_DIRS})
+
+ENDMACRO(moab_pull_make)
diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
index 2a3cd5c061..60029e1a18 100644
--- a/doc/CHANGELOG.rst
+++ b/doc/CHANGELOG.rst
@@ -21,6 +21,7 @@ Next version
   * Update github actions to newer versions as necessary (#958)
   * CMake error message update (#960)
   * Updated documentation to build dependencies (#963)
+  * Allow download from cmake and compilation at build time of MOAB (#969)
 
 v3.2.3
 ====================
diff --git a/src/dagmc/CMakeLists.txt b/src/dagmc/CMakeLists.txt
index 4bc24b2860..2fbc05161a 100644
--- a/src/dagmc/CMakeLists.txt
+++ b/src/dagmc/CMakeLists.txt
@@ -14,10 +14,6 @@ include_directories(${CMAKE_BINARY_DIR}/src/dagmc)
 
 dagmc_install_library(dagmc)
 
-if(DDL_INSTALL_DEPS)
-  add_dependencies(dagmc-shared MOAB)
-  target_link_libraries(dagmc-shared PUBLIC ${MOAB_INSTALL_PREFIX}/lib64/libMOAB.so)
-endif()
 add_subdirectory(tools)
 
 if (BUILD_TESTS)
diff --git a/src/mcnp/CMakeLists.txt b/src/mcnp/CMakeLists.txt
index c4fe947503..983534840c 100644
--- a/src/mcnp/CMakeLists.txt
+++ b/src/mcnp/CMakeLists.txt
@@ -18,6 +18,11 @@ 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)
+add_dependencies(mcnp_funcs MOAB)
+add_dependencies(meshtal_funcs MOAB)
+endif()
+
 if (BUILD_MCNP5)
   add_subdirectory(mcnp5)
 endif ()
diff --git a/src/pyne/CMakeLists.txt b/src/pyne/CMakeLists.txt
index 9fa181a2c6..910c4df542 100644
--- a/src/pyne/CMakeLists.txt
+++ b/src/pyne/CMakeLists.txt
@@ -34,6 +34,3 @@ if(NOT (${HDF5_VERSION} VERSION_LESS 1.12.0))
  endif()
 
 dagmc_install_library(pyne_dagmc)
-if(DDL_INSTALL_DEPS)
-  add_dependencies(pyne_dagmc-shared MOAB)
-endif()

From 615b955c5086d8c98e795d02dff4870e7d09bad9 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 6 Dec 2024 12:33:22 +0100
Subject: [PATCH 5/7] add missing indent

---
 src/mcnp/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mcnp/CMakeLists.txt b/src/mcnp/CMakeLists.txt
index 983534840c..7b4dd5f493 100644
--- a/src/mcnp/CMakeLists.txt
+++ b/src/mcnp/CMakeLists.txt
@@ -19,8 +19,8 @@ message(STATUS "Building object library: meshtal_funcs")
 add_library(meshtal_funcs OBJECT meshtal_funcs.cpp)
 
 if(DDL_INSTALL_DEPS)
-add_dependencies(mcnp_funcs MOAB)
-add_dependencies(meshtal_funcs MOAB)
+  add_dependencies(mcnp_funcs MOAB)
+  add_dependencies(meshtal_funcs MOAB)
 endif()
 
 if (BUILD_MCNP5)

From 26abadb4211423bc9377eed01eef314d85468973 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 6 Dec 2024 13:55:17 +0100
Subject: [PATCH 6/7] generalyze shared lib extention

---
 cmake/DAGMC_macros.cmake     | 2 +-
 cmake/FindMOAB.cmake         | 2 +-
 cmake/MOAB_PullAndMake.cmake | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/DAGMC_macros.cmake b/cmake/DAGMC_macros.cmake
index d8373d2c4b..71fe2a07d0 100644
--- a/cmake/DAGMC_macros.cmake
+++ b/cmake/DAGMC_macros.cmake
@@ -256,7 +256,7 @@ macro (dagmc_install_library lib_name)
     # Required to ensure that MOAB is built before DAGMC and to properly link against MOAB
     if(DDL_INSTALL_DEPS)
       add_dependencies(${lib_name}-shared MOAB)
-      target_link_libraries(${lib_name}-shared PUBLIC ${MOAB_LIBRARY_DIRS}/libMOAB.so)
+      target_link_libraries(${lib_name}-shared PUBLIC ${MOAB_LIBRARY_DIRS}/libMOAB${CMAKE_SHARED_LIBRARY_SUFFIX})
     endif()
   endif ()
 
diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake
index 5497f650ce..483c84b95d 100644
--- a/cmake/FindMOAB.cmake
+++ b/cmake/FindMOAB.cmake
@@ -25,13 +25,13 @@ if (DDL_INSTALL_DEPS)
 # Back to normal behavior
 elseif (MOAB_CMAKE_CONFIG)
   set(MOAB_CMAKE_CONFIG ${MOAB_CMAKE_CONFIG}/MOABConfig.cmake)
+  include(${MOAB_CMAKE_CONFIG})
   message(STATUS "MOAB_CMAKE_CONFIG: ${MOAB_CMAKE_CONFIG}")
 else ()
   message(FATAL_ERROR "Could not find MOAB. Set -DMOAB_DIR=<MOAB_DIR> when running cmake or use the $MOAB_DIR environment variable.")
 endif ()
 
 # Find HDF5
-include(${MOAB_CMAKE_CONFIG})
 set(ENV{PATH} "${HDF5_DIR}:$ENV{PATH}")
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
 find_package(HDF5 REQUIRED)
diff --git a/cmake/MOAB_PullAndMake.cmake b/cmake/MOAB_PullAndMake.cmake
index e068c718bb..16c0594bf3 100644
--- a/cmake/MOAB_PullAndMake.cmake
+++ b/cmake/MOAB_PullAndMake.cmake
@@ -10,6 +10,7 @@ MACRO (moab_pull_make moab_version)
     set(MOAB_INCLUDE_DIRS "${MOAB_INSTALL_PREFIX}/include")
     set(MOAB_LIBRARY_DIRS "${MOAB_INSTALL_PREFIX}/lib")
     message("MOAB_LIBRARY_DIRS: ${MOAB_LIBRARY_DIRS}")
+    MEsSAGE("CMAKE_SHARED_LIBRARY_SUFFIX: ${CMAKE_SHARED_LIBRARY_SUFFIX}")
     set(MOAB_LIBRARIES_SHARED "")
     ExternalProject_Add(MOAB_ep
       PREFIX ${MOAB_ROOT}   
@@ -32,7 +33,7 @@ MACRO (moab_pull_make moab_version)
     add_library(MOAB INTERFACE)
 
     target_include_directories(MOAB SYSTEM INTERFACE ${MOAB_INCLUDE_DIRS})
-    target_link_libraries(MOAB INTERFACE ${MOAB_LIBRARY_DIRS}/libMOAB.so)
+    target_link_libraries(MOAB INTERFACE ${MOAB_LIBRARY_DIRS}/libMOAB${CMAKE_SHARED_LIBRARY_SUFFIX})
     add_dependencies(MOAB MOAB_ep)
     install(TARGETS MOAB LIBRARY DESTINATION ${MOAB_LIBRARY_DIRS}
                         PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR})

From 8c05ac74de6d231cac80a53132364b078d08f6b2 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 6 Dec 2024 14:20:19 +0100
Subject: [PATCH 7/7] temporary change to master

---
 cmake/FindMOAB.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake
index 483c84b95d..428ac24624 100644
--- a/cmake/FindMOAB.cmake
+++ b/cmake/FindMOAB.cmake
@@ -17,7 +17,8 @@ if (DDL_INSTALL_DEPS)
     message(FATAL_ERROR "DDL_INSTALL_DEPS is ONLY compatible with shared libraries.")
   ENDIF()
   IF(NOT MOAB_VERSION)
-    SET(MOAB_VERSION "5.5.1")
+    # SET(MOAB_VERSION "5.5.1")
+    SET(MOAB_VERSION "master")
   ENDIF()
   include(MOAB_PullAndMake)
   moab_pull_make(${MOAB_VERSION})