From 76660f7459c5df5071f5369ea81e92a9a974f167 Mon Sep 17 00:00:00 2001
From: shriwise <pshriwise@gmail.com>
Date: Thu, 2 Aug 2018 11:29:28 -0500
Subject: [PATCH] Changing list of sources back to library command and
 ifdef'ing all CAD source files.

---
 CMakeLists.txt     | 13 ++++---------
 src/cad.cpp        |  4 ++++
 src/cad.h          |  5 +++++
 src/cad_header.F90 |  4 ++++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d79701bd8c..a5a187dba4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,10 +309,11 @@ set_target_properties(faddeeva PROPERTIES
 # libopenmc
 #===============================================================================
 
-set(LIBOPENMC_SRC SHARED
+add_library(libopenmc SHARED
   src/algorithm.F90
   src/bank_header.F90
   src/api.F90
+  src/cad_header.F90
   src/cmfd_data.F90
   src/cmfd_execute.F90
   src/cmfd_header.F90
@@ -401,6 +402,8 @@ set(LIBOPENMC_SRC SHARED
   src/tallies/tally_header.F90
   src/tallies/trigger.F90
   src/tallies/trigger_header.F90
+  src/cad.cpp
+  src/cad.h
   src/cell.cpp
   src/cmfd_execute.cpp
   src/distribution.cpp
@@ -447,14 +450,6 @@ set(LIBOPENMC_SRC SHARED
   src/xml_interface.cpp
   src/xsdata.cpp)
 
-# add cad sources if enabled
-if(cad)
-  list(APPEND LIBOPENMC_SRC src/cad_header.F90)
-  list(APPEND LIBOPENMC_SRC src/cad.h src/cad.cpp)
-endif()
-
-add_library(libopenmc SHARED ${LIBOPENMC_SRC})
-
 set_target_properties(libopenmc PROPERTIES
   OUTPUT_NAME openmc
   LINKER_LANGUAGE Fortran)
diff --git a/src/cad.cpp b/src/cad.cpp
index 79321e397f..a8a2a37223 100644
--- a/src/cad.cpp
+++ b/src/cad.cpp
@@ -1,4 +1,6 @@
 
+#ifdef CAD
+
 #include "cad.h"
 
 moab::DagMC* DAGMC;
@@ -65,3 +67,5 @@ void free_memory_cad_c()
 {
   delete DAGMC;
 }
+
+#endif
diff --git a/src/cad.h b/src/cad.h
index ff2540841d..8f14d25300 100644
--- a/src/cad.h
+++ b/src/cad.h
@@ -1,3 +1,6 @@
+
+#ifdef CAD
+
 #ifndef CAD_H
 #define CAD_H
 
@@ -11,3 +14,5 @@ extern "C" void load_cad_geometry_c();
 extern "C" void free_memory_cad_c();
 
 #endif // CAD_H
+
+#endif
diff --git a/src/cad_header.F90 b/src/cad_header.F90
index 04db460e1d..8982114549 100644
--- a/src/cad_header.F90
+++ b/src/cad_header.F90
@@ -1,3 +1,5 @@
+#ifdef CAD
+
 module cad_header
 
   use, intrinsic :: ISO_C_BINDING
@@ -24,3 +26,5 @@ contains
   end subroutine free_memory_cad
 
 end module cad_header
+
+#endif