From bc3a09283683782dcae5d6e883e8ef90411315fc Mon Sep 17 00:00:00 2001
From: shriwise <pshriwise@gmail.com>
Date: Fri, 23 Feb 2018 01:14:48 -0600
Subject: [PATCH] Linking to the MOAB/DAGMC libraries.

---
 CMakeLists.txt |  6 +++++-
 src/cad.cpp    | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37104da361..e7e9f54b73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # Set module path
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 
+# Make sure Fortran module directory is included when building
+include_directories(${CMAKE_BINARY_DIR}/include)
 #===============================================================================
 # Command line options
 #===============================================================================
@@ -394,6 +396,8 @@ add_library(libopenmc SHARED
   src/tallies/tally_header.F90
   src/tallies/trigger.F90
   src/tallies/trigger_header.F90
+  src/cad.h
+  src/cad.cpp
   src/cell.cpp
   src/cmfd_execute.cpp
   src/distribution.cpp
@@ -490,7 +494,7 @@ target_link_libraries(libopenmc ${ldflags} ${HDF5_LIBRARIES} pugixml
 
 add_executable(openmc src/main.cpp)
 target_compile_options(openmc PRIVATE ${cxxflags})
-target_link_libraries(openmc libopenmc)
+target_link_libraries(openmc ${ldflags} libopenmc ${DAGMC_LINK_LIBS})
 
 #===============================================================================
 # Python package
diff --git a/src/cad.cpp b/src/cad.cpp
index 935b9d7737..3b4d454364 100644
--- a/src/cad.cpp
+++ b/src/cad.cpp
@@ -1,5 +1,17 @@
 
 #include "cad.h"
 
-moab::DagMC* DAGMC;
 
+namespace moab {
+  
+DagMC* DAGMC;
+
+void load_geometry() {
+  if(!DAGMC) { DAGMC = new DagMC(); }
+
+  ErrorCode rval;
+
+  return;
+}
+  
+}