Changing list of sources back to library command and ifdef'ing all CAD source files.

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)

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

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

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