change to new centralized registration system

CMakeLists.txt

@@ -130,17 +130,18 @@ SUBDIRLIST(MATERIALSDIRS ${MATERIALSPATH})
 SUBDIRLIST(ELEMENTSDIRS ${ELEMENTSPATH})
 
 set(INSTALLED_MODULES "")
+set(INSTALLED_MODULE_PATHS "")
 
 foreach(DIRNAME ${COREDIRS})
     get_filename_component(MODULEPATH "${COREPATH}/${DIRNAME}" ABSOLUTE) 
     if(EXISTS ${MODULEPATH}/module.cmake)
         if (NOT DEFINED CORE_MODULES)
             set(CORE_MODULES "all")
         endif()
-        if( ${CORE_MODULES} STREQUAL "all" OR ${DIRNAME} IN_LIST CORE_MODULES) 
+        if( CORE_MODULES STREQUAL "all" OR ${DIRNAME} IN_LIST CORE_MODULES) 
             message("--> found ${DIRNAME}")
-            include(${MODULEPATH}/module.cmake)
             list(APPEND INSTALLED_MODULES ${DIRNAME})
+            list(APPEND INSTALLED_MODULEPATHS ${MODULEPATH})
         endif()
     endif()
 endforeach(DIRNAME)
@@ -151,10 +152,10 @@ foreach(DIRNAME ${MATERIALSDIRS})
         if (NOT DEFINED MATERIAL_MODULES)
             set(MATERIAL_MODULES "all")
         endif()
-        if(${MATERIAL_MODULES} STREQUAL "all" OR ${DIRNAME} IN_LIST MATERIAL_MODULES)
+        if(MATERIAL_MODULES STREQUAL "all" OR ${DIRNAME} IN_LIST MATERIAL_MODULES)
             message("--> found ${DIRNAME}")
-            include(${MODULEPATH}/module.cmake)
             list(APPEND INSTALLED_MODULES ${DIRNAME})
+            list(APPEND INSTALLED_MODULEPATHS ${MODULEPATH})
         endif()
     endif()
 endforeach(DIRNAME)
@@ -165,14 +166,18 @@ foreach(DIRNAME ${ELEMENTSDIRS})
         if (NOT DEFINED ELEMENT_MODULES)
             set(ELEMENT_MODULES "all")
         endif()
-        if(${ELEMENT_MODULES} STREQUAL "all" OR ${DIRNAME} IN_LIST ELEMENT_MODULES)
+        if(ELEMENT_MODULES STREQUAL "all" OR ${DIRNAME} IN_LIST ELEMENT_MODULES)
             message("--> found ${DIRNAME}")
-            include(${MODULEPATH}/module.cmake)
             list(APPEND INSTALLED_MODULES ${DIRNAME})
+            list(APPEND INSTALLED_MODULEPATHS ${MODULEPATH})
         endif()
     endif()
 endforeach(DIRNAME)
 
+foreach(MODULEPATH ${INSTALLED_MODULEPATHS})
+    include(${MODULEPATH}/module.cmake)
+endforeach(MODULEPATH)
+
 message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
 
 # compile the shared library

src/Marmot.cpp

@@ -3,6 +3,7 @@
 #include "Marmot/MarmotJournal.h"
 #include "Marmot/MarmotMaterial.h"
 #include <cassert>
+#include <iostream>
 #include <string>
 #include <tuple>
 #include <unordered_map>