#1217 Move header files into INTERFACE.

CMakeLists.txt

 # A minimum version for cmake command is required.
 cmake_minimum_required(VERSION 3.8)
 
-project( "MoReFEM")
+project( "MoReFEM_CMAKE")
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 

Scripts/GenerateSourceList4CMake.py

@@ -8,24 +8,31 @@ def FilterCppFiles(file_list):
     
     \param[in] file_list Initial file list.
     
-    \return The filtered list.
+    \return A pair with cpp file list in the first slot and header file list (hpp and hxx) in the second one.
     """
     ret = []
     
-    cpp_extension_list = ("cpp", "hpp", "hxx")
+    cpp_extension = "cpp"
+    header_extension_list = ("hpp", "hxx")
+    
+    source_list = []
+    header_list = []
     
     for myfile in file_list:
         extension = os.path.splitext(myfile)[1]
 
         if extension.startswith('.'):
             extension = extension[1:]
-
-        if extension not in cpp_extension_list:
-            continue
             
-        ret.append(myfile)
+        if extension == cpp_extension:
+            source_list.append(myfile)
+        elif extension in header_extension_list:
+            header_list.append(myfile)
+            
+    source_list.sort()
+    header_list.sort()
     
-    return ret
+    return (source_list, header_list)
     
 
 
@@ -47,17 +54,26 @@ def GenerateInModule(morefem_directory, subdirectory, library_name, ignore_list
         if ignore_list:
             dirs[:] = [d for d in dirs if d not in ignore_list]
     
-        file_list = FilterCppFiles(files)      
-        file_list.sort()
+        (source_list, header_list) = FilterCppFiles(files)      
         
-        reduced_source_root = os.path.relpath(root, source_directory)
         
+#        reduced_source_root = os.path.relpath(root, source_directory)
         
         with open(os.path.join(root, "SourceList.cmake"), "w") as SourceList:
-            SourceList.write("target_sources({}\n\tPRIVATE\n".format(library_name))
+            
+            SourceList.write("target_sources({}\n".format(library_name))
+            
+            if source_list:
+                SourceList.write("\n\tPRIVATE\n")
 
-            for myfile in file_list:
+                for myfile in source_list:
+                    SourceList.write("{}\"{}/{}\" / \n".format(tab_prefix, r"${CMAKE_CURRENT_LIST_DIR}", myfile))
+            
+            SourceList.write("\n\tINTERFACE\n")
+            
+            for myfile in header_list:
                 SourceList.write("{}\"{}/{}\" / \n".format(tab_prefix, r"${CMAKE_CURRENT_LIST_DIR}", myfile))
+            
             SourceList.write(")\n\n")
 
             for directory in dirs:

Sources/Core/Crtp/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubsetForMatrix.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubsetForMatrix.hxx" / 
 )

Sources/Core/EnsightCaseReader/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/EnsightCaseReader.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/EnsightCaseReader.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/EnsightCaseReader.hxx" / 
 )

Sources/Core/InputParameter/Crtp/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/Section.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Section.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Section.hxx" / 
 )

Sources/Core/InputParameter/DirichletBoundaryCondition/Impl/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/DirichletBoundaryCondition.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/DirichletBoundaryCondition.hpp" / 
 )
 

Sources/Core/InputParameter/DirichletBoundaryCondition/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/DirichletBoundaryCondition.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/DirichletBoundaryCondition.hxx" / 
 )

Sources/Core/InputParameter/FElt/Impl/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/FEltSpace.cpp" / 
-		"${CMAKE_CURRENT_LIST_DIR}/FEltSpace.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubset.cpp" / 
-		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubset.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Unknown.cpp" / 
+
+	INTERFACE
+		"${CMAKE_CURRENT_LIST_DIR}/FEltSpace.hpp" / 
+		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubset.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Unknown.hpp" / 
 )
 

Sources/Core/InputParameter/FElt/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/FEltSpace.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/FEltSpace.hxx" / 
 		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubset.hpp" / 

Sources/Core/InputParameter/Geometry/Impl/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/Domain.cpp" / 
-		"${CMAKE_CURRENT_LIST_DIR}/Domain.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/LightweightDomainList.cpp" / 
-		"${CMAKE_CURRENT_LIST_DIR}/LightweightDomainList.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Mesh.cpp" / 
-		"${CMAKE_CURRENT_LIST_DIR}/Mesh.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/PseudoNormals.cpp" / 
+
+	INTERFACE
+		"${CMAKE_CURRENT_LIST_DIR}/Domain.hpp" / 
+		"${CMAKE_CURRENT_LIST_DIR}/LightweightDomainList.hpp" / 
+		"${CMAKE_CURRENT_LIST_DIR}/Mesh.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/PseudoNormals.hpp" / 
 )
 

Sources/Core/InputParameter/Geometry/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
+		"${CMAKE_CURRENT_LIST_DIR}/InterpolationFile.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Domain.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Domain.hxx" / 
-		"${CMAKE_CURRENT_LIST_DIR}/InterpolationFile.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/InterpolationFile.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/InterpolationFile.hxx" / 
 		"${CMAKE_CURRENT_LIST_DIR}/LightweightDomainList.hpp" / 

Sources/Core/InputParameter/InitialCondition/Impl/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/InitialCondition.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/InitialCondition.hpp" / 
 )
 

Sources/Core/InputParameter/InitialCondition/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/InitialCondition.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/InitialCondition.hxx" / 
 )

Sources/Core/InputParameter/Interpolator/Impl/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/InitVertexMatching.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/InitVertexMatching.hpp" / 
 )
 

Sources/Core/InputParameter/Interpolator/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/InitVertexMatching.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/InitVertexMatching.hxx" / 
 )

Sources/Core/InputParameter/Parameter/AnalyticalPrestress/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/AnalyticalPrestress.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/AnalyticalPrestress.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/AnalyticalPrestress.hxx" / 
 )

Sources/Core/InputParameter/Parameter/Diffusion/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/Density.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Diffusion.cpp" / 
+		"${CMAKE_CURRENT_LIST_DIR}/TransfertCoefficient.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Diffusion.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Diffusion.hxx" / 
-		"${CMAKE_CURRENT_LIST_DIR}/TransfertCoefficient.cpp" / 
 )
 

Sources/Core/InputParameter/Parameter/ElectricalActivation/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/ElectricalActivation.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/ElectricalActivation.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/ElectricalActivation.hxx" / 
 )

Sources/Core/InputParameter/Parameter/Fiber/Impl/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/Fiber.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Fiber.hpp" / 
 )
 

Sources/Core/InputParameter/Parameter/Fiber/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Fiber.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Fiber.hxx" / 
 )

Sources/Core/InputParameter/Parameter/Fluid/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/Fluid.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Fluid.hpp" / 
 )
 

Sources/Core/InputParameter/Parameter/Heart/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/Heart.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Heart.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Heart.hxx" / 
 )

Sources/Core/InputParameter/Parameter/Impl/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/ParameterUsualDescription.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/ParameterUsualDescription.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/ParameterUsualDescription.hxx" / 
 )

Sources/Core/InputParameter/Parameter/MaterialProperty/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/VolumicMass.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/VolumicMass.hxx" / 
 )

Sources/Core/InputParameter/Parameter/Solid/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/C_i_Mu_i.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/HyperelasticBulk.cpp" / 
@@ -8,8 +9,10 @@ target_sources(morefem_core
 		"${CMAKE_CURRENT_LIST_DIR}/LameMu.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/PoissonRatio.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Solid.cpp" / 
-		"${CMAKE_CURRENT_LIST_DIR}/Solid.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Viscosity.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/YoungModulus.cpp" / 
+
+	INTERFACE
+		"${CMAKE_CURRENT_LIST_DIR}/Solid.hpp" / 
 )
 

Sources/Core/InputParameter/Parameter/Source/Impl/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/RectangularSourceTimeParameter.cpp" / 
-		"${CMAKE_CURRENT_LIST_DIR}/RectangularSourceTimeParameter.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/TransientSource.cpp" / 
+
+	INTERFACE
+		"${CMAKE_CURRENT_LIST_DIR}/RectangularSourceTimeParameter.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/TransientSource.hpp" / 
 )
 

Sources/Core/InputParameter/Parameter/Source/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/Pressure.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Pressure.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Pressure.hxx" / 
 		"${CMAKE_CURRENT_LIST_DIR}/RectangularSourceTimeParameter.hpp" / 

Sources/Core/InputParameter/Parameter/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/SpatialFunction.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/SpatialFunction.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/SpatialFunction.hxx" / 
 )

Sources/Core/InputParameter/Parameter/ViscoelasticBoundaryCondition/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/ViscoelasticBoundaryCondition.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/ViscoelasticBoundaryCondition.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/ViscoelasticBoundaryCondition.hxx" / 
 )

Sources/Core/InputParameter/Reaction/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/FitzHughNagumo.cpp" / 
+		"${CMAKE_CURRENT_LIST_DIR}/MitchellSchaeffer.cpp" / 
+		"${CMAKE_CURRENT_LIST_DIR}/ReactionCoefficient.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/FitzHughNagumo.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/FitzHughNagumo.hxx" / 
-		"${CMAKE_CURRENT_LIST_DIR}/MitchellSchaeffer.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/MitchellSchaeffer.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/MitchellSchaeffer.hxx" / 
-		"${CMAKE_CURRENT_LIST_DIR}/ReactionCoefficient.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/ReactionCoefficient.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/ReactionCoefficient.hxx" / 
 )

Sources/Core/InputParameter/Solver/Impl/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/Petsc.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Petsc.hpp" / 
 )
 

Sources/Core/InputParameter/Solver/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/ConvergenceTest.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/ConvergenceTest.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/ConvergenceTest.hxx" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Petsc.hpp" / 

Sources/Core/InputParameter/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/InitialConditionGate.cpp" / 
+		"${CMAKE_CURRENT_LIST_DIR}/Result.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/InitialConditionGate.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/OutputDeformedMesh.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/OutputDeformedMesh.hxx" / 
-		"${CMAKE_CURRENT_LIST_DIR}/Result.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Result.hpp" / 
 )
 

Sources/Core/InputParameter/TimeManager/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/TimeManager.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/TimeManager.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/TimeManager.hxx" / 
 )

Sources/Core/InputParameterData/Advanced/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/SetFromInputParameterData.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/SetFromInputParameterData.hxx" / 
 )

Sources/Core/InputParameterData/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/InputParameterList.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/InputParameterList.hxx" / 
 )

Sources/Core/LinearAlgebra/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/GlobalDiagonalMatrix.cpp" / 
+		"${CMAKE_CURRENT_LIST_DIR}/GlobalMatrix.cpp" / 
+		"${CMAKE_CURRENT_LIST_DIR}/GlobalVector.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/GlobalDiagonalMatrix.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/GlobalDiagonalMatrix.hxx" / 
-		"${CMAKE_CURRENT_LIST_DIR}/GlobalMatrix.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/GlobalMatrix.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/GlobalMatrix.hxx" / 
-		"${CMAKE_CURRENT_LIST_DIR}/GlobalVector.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/GlobalVector.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/GlobalVector.hxx" / 
 )

Sources/Core/MoReFEMData/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/MoReFEMData.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/MoReFEMData.hxx" / 
 )

Sources/Core/NumberingSubset/Internal/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
+		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubsetManager.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/FetchFunction.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/FetchFunction.hxx" / 
 		"${CMAKE_CURRENT_LIST_DIR}/FindFunctor.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/FindFunctor.hxx" / 
-		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubsetManager.cpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubsetManager.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubsetManager.hxx" / 
 )

Sources/Core/NumberingSubset/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubset.cpp" / 
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubset.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/NumberingSubset.hxx" / 
 )

Sources/Core/Solver/SourceList.cmake

 target_sources(morefem_core
-	PRIVATE
+
+	INTERFACE
 		"${CMAKE_CURRENT_LIST_DIR}/Solver.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/Solver.hxx" / 
 )

Sources/Core/SourceList.cmake

 target_sources(morefem_core
+
 	PRIVATE
-		"${CMAKE_CURRENT_LIST_DIR}/Enum.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/InitTimeKeepLog.cpp" / 
+
+	INTERFACE
+		"${CMAKE_CURRENT_LIST_DIR}/Enum.hpp" / 
 		"${CMAKE_CURRENT_LIST_DIR}/InitTimeKeepLog.hpp" / 
 )