move everything back to single level

code/CMakeLists.txt

@@ -78,6 +78,68 @@ target_link_libraries(DAMASK_SOURCE DAMASK_DRIVERS)
 add_library(DAMASK_CONSTITUTIVE "constitutive.f90")
 target_link_libraries(DAMASK_CONSTITUTIVE DAMASK_PLASTIC DAMASK_KINEMATICS DAMASK_SOURCE)
 
-# compile spectral solver
+add_library(DAMASK_CRYSTALLITE "crystallite.f90")
-add_executable(DAMASKSpectral.exe DAMASK_spectral.f90)
+target_link_libraries(DAMASK_CRYSTALLITE DAMASK_CONSTITUTIVE)
-target_link_libraries (DAMASKSpectral.exe DAMASK_CONSTITUTIVE)
+
+add_library(DAMASK_HOMOGENIZATION "homogenization.f90"
+                                  "homogenization_RGC.f90"
+                                  "homogenization_isostrain.f90"
+                                  "homogenization_none.f90")
+target_link_libraries(DAMASK_HOMOGENIZATION DAMASK_CRYSTALLITE)
+
+add_library(DAMASK_HYDROGENFLUX "hydrogenflux_isoconc.f90"
+                                "hydrogenflux_cahnhilliard.f90")
+target_link_libraries(DAMASK_HYDROGENFLUX DAMASK_CRYSTALLITE)
+
+add_library(DAMASK_POROSITY "porosity_none.f90"
+                            "porosity_phasefield.f90")
+target_link_libraries(DAMASK_POROSITY DAMASK_CRYSTALLITE)
+
+add_library(DAMASK_VACANCYFLUX "vacancyflux_isoconc.f90"
+                               "vacancyflux_isochempot.f90"
+                               "vacancyflux_cahnhilliard.f90")
+target_link_libraries(DAMASK_VACANCYFLUX DAMASK_CRYSTALLITE)
+
+add_library(DAMASK_DAMAGE "damage_none.f90"
+                          "damage_local.f90"
+                          "damage_nonlocal.f90")
+target_link_libraries(DAMASK_DAMAGE DAMASK_CRYSTALLITE)
+
+add_library(DAMASK_THERMAL "thermal_isothermal.f90"
+                           "thermal_adiabatic.f90"
+                           "thermal_conduction.f90")
+target_link_libraries(DAMASK_THERMAL DAMASK_CRYSTALLITE)
+
+add_library(DAMASK_ENGINE "homogenization.f90")
+target_link_libraries(DAMASK_ENGINE DAMASK_THERMAL
+                                    DAMASK_DAMAGE
+                                    DAMASK_VACANCYFLUX
+                                    DAMASK_POROSITY
+                                    DAMASK_HYDROGENFLUX
+                                    DAMASK_HOMOGENIZATION)
+
+add_library(DAMASK_CPFE "CPFEM.f90"
+                        "CPFEM2.f90")
+target_link_libraries(DAMASK_CPFE DAMASK_ENGINE)
+
+if (FEM)
+      message("special treatment for FEM code")
+endif(FEM)
+
+if (SPECTRAL)
+      add_library(DAMASK_SPECTRAL_UTILITY spectral_utilities.f90)
+      target_link_libraries(DAMASK_SPECTRAL_UTILITY DAMASK_CPFE2)
+
+      add_library(DAMASK_SPECTRAL_BASE "spectral_thermal.f90"
+                                       "spectral_damage.f90")
+      target_link_libraries(DAMASK_SPECTRAL_BASE DAMASK_SPECTRAL_UTILITY)
+
+      add_library(DAMASK_SPECTRAL_MECH "spectral_mech_AL.f90"
+                                       "spectral_mech_Polarisation.f90"
+                                       "spectral_mech_Basic.f90")
+      target_link_libraries(DAMASK_SPECTRAL_MECH DAMASK_SPECTRAL_UTILITY)
+
+      add_executable(DAMASKSpectral.exe DAMASK_spectral.f90)
+      target_link_libraries(DAMASKSpectral.exe DAMASK_SPECTRAL_BASE
+                                               DAMASK_SPECTRAL_MECH)
+endif(SPECTRAL)

code/damage/CMakeLists.txt

@@ -1,15 +0,0 @@
-# group sources
-set (DAMAGE   "damage_none"
-              "damage_local"
-              "damage_nonlocal"
-    )
-
-# compile damage module
-foreach (p ${DAMAGE})
-    add_library (${p} "${p}.f90")
-endforeach (p)
-
-# set libraries for linking
-foreach (p ${DAMAGE})
-    set (DAMASK_LIB ${DAMASK_LIB} ${P})
-endforeach (p)

code/homogenization/CMakeLists.txt

@@ -1,16 +0,0 @@
-# group sources
-set (HOMOGENIZATION   "homogenization"
-                      "homogenization_RGC"
-                      "homogenization_isostrain"
-                      "homogenization_none"
-    )
-
-# compile modules
-foreach (p ${HOMOGENIZATION})
-    add_library (${p} "${p}.f90")
-endforeach (p)
-
-# set libraries/modules for linking
-foreach (p ${HOMOGENIZATION})
-    set (DAMASK_LIB ${DAMASK_LIB} ${p})
-endforeach (p)

code/hydrogenflux/CMakeLists.txt

@@ -1,14 +0,0 @@
-# group sources
-set (HYDROGENFLUX   "hydrogenflux_isoconc"
-                    "hydrogenflux_cahnhilliard"
-    )
-
-# compile hydrogenflux modules
-foreach (p ${HYDROGENFLUX})
-    add_library (${p} "${p}.f90")
-endforeach (p)
-
-# set libraries/modules for linking
-foreach (p ${HYDROGENFLUX})
-    set (DAMASK_LIB ${DAMASK_LIB} ${p})
-endforeach (p)

code/porosity/CMakeLists.txt

@@ -1,14 +0,0 @@
-# group sources
-set (POROSITY "porosity_none"
-              "porosity_phasefield"
-    )
-
-# compile porosity modules
-foreach (p ${POROSITY})
-    add_library (${p} "${p}.f90")
-endforeach (p)
-
-# set libraries/modules for linking
-foreach (p ${POROSITY})
-    set (DAMASK_LIB ${DAMASK_LIB} ${p})
-endforeach (p)

code/spectral/CMakeLists.txt

@@ -1,18 +0,0 @@
-# group source for sepctral solver driver
-set (SPECTRAL "spectral_damage"
-              "spectral_mech_AL"
-              "spectral_mech_Basic"
-              "spectral_mech_Polarisation"
-              "spectral_thermal"
-              "spectral_utilities"
-    )
-
-# compile spectral solver driver module
-foreach (p ${SPECTRAL})
-    add_library (${p} "${p}.f90")
-endforeach (p)
-
-# set libraries/modules for linking
-foreach (p ${SPECTRAL})
-    set (DAMASK_LIB ${DAMASK_LIB} ${p})
-endforeach (p)

code/thermal/CMakeLists.txt

@@ -1,15 +0,0 @@
-# group source related themal module
-set (THERMAL  "thermal_isothermal"
-              "thermal_adiabatic"
-              "thermal_conduction"
-    )
-
-# compiler theraml module
-foreach (p ${THERMAL})
-    add_library (${p} "${p}.f90")
-endforeach (p)
-
-# set libraries/modules for linking
-foreach (p ${THERMAL})
-    set (DAMASK_LIB ${DAMASK_LIB} ${p})
-endforeach (p)

code/vacancyflux/CMakeLists.txt

@@ -1,15 +0,0 @@
-# group source file
-set (VACANCYFLUX    "vacancyflux_isoconc"
-                    "vacancyflux_isochempot"
-                    "vacancyflux_cahnhilliard"
-    )
-
-# compiler as module
-foreach (p ${VACANCYFLUX})
-    add_library (${p} "${p}.f90")
-endforeach (p)
-
-# set libraries/modules for linking
-foreach (p ${VACANCYFLUX})
-    set (DAMASK_LIB ${DAMASK_LIB} ${p})
-endforeach (p)