diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e7ec638b..fd0b0727 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,5 +1,7 @@ on: push: + branches: + - master workflow_dispatch: permissions: diff --git a/CMakeLists.txt b/CMakeLists.txt index 5890abf2..e3651caa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,9 @@ endif() # Include directories # -------------------------------------------------------------------------------------------------------- -target_include_directories(${PROJECT_NAME} INTERFACE "include") +target_include_directories( + ${PROJECT_NAME} INTERFACE $ + $) # -------------------------------------------------------------------------------------------------------- # Setup Dependencies @@ -205,12 +207,14 @@ endif() install( TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME}_Targets + EXPORT ${PROJECT_NAME}-config LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -# TOOD: This could be improved if the header files were in a sub-directory +install( + EXPORT ${PROJECT_NAME}-config + FILE ${PROJECT_NAME}-config.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) -file(GLOB headers "include/*.hpp") -install(FILES ${headers} DESTINATION include) +install(DIRECTORY "include/viennals" TYPE INCLUDE) diff --git a/include/lsAdvect.hpp b/include/viennals/lsAdvect.hpp similarity index 100% rename from include/lsAdvect.hpp rename to include/viennals/lsAdvect.hpp diff --git a/include/lsBooleanOperation.hpp b/include/viennals/lsBooleanOperation.hpp similarity index 100% rename from include/lsBooleanOperation.hpp rename to include/viennals/lsBooleanOperation.hpp diff --git a/include/lsCalculateCurvatures.hpp b/include/viennals/lsCalculateCurvatures.hpp similarity index 100% rename from include/lsCalculateCurvatures.hpp rename to include/viennals/lsCalculateCurvatures.hpp diff --git a/include/lsCalculateNormalVectors.hpp b/include/viennals/lsCalculateNormalVectors.hpp similarity index 100% rename from include/lsCalculateNormalVectors.hpp rename to include/viennals/lsCalculateNormalVectors.hpp diff --git a/include/lsCheck.hpp b/include/viennals/lsCheck.hpp similarity index 100% rename from include/lsCheck.hpp rename to include/viennals/lsCheck.hpp diff --git a/include/lsConcepts.hpp b/include/viennals/lsConcepts.hpp similarity index 100% rename from include/lsConcepts.hpp rename to include/viennals/lsConcepts.hpp diff --git a/include/lsConvexHull.hpp b/include/viennals/lsConvexHull.hpp similarity index 100% rename from include/lsConvexHull.hpp rename to include/viennals/lsConvexHull.hpp diff --git a/include/lsCurvatureFormulas.hpp b/include/viennals/lsCurvatureFormulas.hpp similarity index 100% rename from include/lsCurvatureFormulas.hpp rename to include/viennals/lsCurvatureFormulas.hpp diff --git a/include/lsDetectFeatures.hpp b/include/viennals/lsDetectFeatures.hpp similarity index 100% rename from include/lsDetectFeatures.hpp rename to include/viennals/lsDetectFeatures.hpp diff --git a/include/lsDomain.hpp b/include/viennals/lsDomain.hpp similarity index 100% rename from include/lsDomain.hpp rename to include/viennals/lsDomain.hpp diff --git a/include/lsEnquistOsher.hpp b/include/viennals/lsEnquistOsher.hpp similarity index 100% rename from include/lsEnquistOsher.hpp rename to include/viennals/lsEnquistOsher.hpp diff --git a/include/lsExpand.hpp b/include/viennals/lsExpand.hpp similarity index 100% rename from include/lsExpand.hpp rename to include/viennals/lsExpand.hpp diff --git a/include/lsExtrude.hpp b/include/viennals/lsExtrude.hpp similarity index 100% rename from include/lsExtrude.hpp rename to include/viennals/lsExtrude.hpp diff --git a/include/lsFileFormats.hpp b/include/viennals/lsFileFormats.hpp similarity index 100% rename from include/lsFileFormats.hpp rename to include/viennals/lsFileFormats.hpp diff --git a/include/lsFiniteDifferences.hpp b/include/viennals/lsFiniteDifferences.hpp similarity index 100% rename from include/lsFiniteDifferences.hpp rename to include/viennals/lsFiniteDifferences.hpp diff --git a/include/lsFromMesh.hpp b/include/viennals/lsFromMesh.hpp similarity index 100% rename from include/lsFromMesh.hpp rename to include/viennals/lsFromMesh.hpp diff --git a/include/lsFromSurfaceMesh.hpp b/include/viennals/lsFromSurfaceMesh.hpp similarity index 99% rename from include/lsFromSurfaceMesh.hpp rename to include/viennals/lsFromSurfaceMesh.hpp index 3f72c302..4dc979d7 100644 --- a/include/lsFromSurfaceMesh.hpp +++ b/include/viennals/lsFromSurfaceMesh.hpp @@ -490,4 +490,4 @@ template class lsFromSurfaceMesh { // add all template specialisations for this class PRECOMPILE_PRECISION_DIMENSION(lsFromSurfaceMesh) -#endif // LS_FROM_SURFACE_MESH_HPP +#endif // LS_FROM_SURFACE_MESH_HPP \ No newline at end of file diff --git a/include/lsFromVolumeMesh.hpp b/include/viennals/lsFromVolumeMesh.hpp similarity index 100% rename from include/lsFromVolumeMesh.hpp rename to include/viennals/lsFromVolumeMesh.hpp diff --git a/include/lsGeometricAdvect.hpp b/include/viennals/lsGeometricAdvect.hpp similarity index 100% rename from include/lsGeometricAdvect.hpp rename to include/viennals/lsGeometricAdvect.hpp diff --git a/include/lsGeometricAdvectDistributions.hpp b/include/viennals/lsGeometricAdvectDistributions.hpp similarity index 100% rename from include/lsGeometricAdvectDistributions.hpp rename to include/viennals/lsGeometricAdvectDistributions.hpp diff --git a/include/lsGeometries.hpp b/include/viennals/lsGeometries.hpp similarity index 100% rename from include/lsGeometries.hpp rename to include/viennals/lsGeometries.hpp diff --git a/include/lsGraph.hpp b/include/viennals/lsGraph.hpp similarity index 100% rename from include/lsGraph.hpp rename to include/viennals/lsGraph.hpp diff --git a/include/lsLaxFriedrichs.hpp b/include/viennals/lsLaxFriedrichs.hpp similarity index 100% rename from include/lsLaxFriedrichs.hpp rename to include/viennals/lsLaxFriedrichs.hpp diff --git a/include/lsLocalLaxFriedrichs.hpp b/include/viennals/lsLocalLaxFriedrichs.hpp similarity index 100% rename from include/lsLocalLaxFriedrichs.hpp rename to include/viennals/lsLocalLaxFriedrichs.hpp diff --git a/include/lsLocalLaxFriedrichsAnalytical.hpp b/include/viennals/lsLocalLaxFriedrichsAnalytical.hpp similarity index 100% rename from include/lsLocalLaxFriedrichsAnalytical.hpp rename to include/viennals/lsLocalLaxFriedrichsAnalytical.hpp diff --git a/include/lsLocalLocalLaxFriedrichs.hpp b/include/viennals/lsLocalLocalLaxFriedrichs.hpp similarity index 100% rename from include/lsLocalLocalLaxFriedrichs.hpp rename to include/viennals/lsLocalLocalLaxFriedrichs.hpp diff --git a/include/lsMakeGeometry.hpp b/include/viennals/lsMakeGeometry.hpp similarity index 100% rename from include/lsMakeGeometry.hpp rename to include/viennals/lsMakeGeometry.hpp diff --git a/include/lsMarchingCubes.hpp b/include/viennals/lsMarchingCubes.hpp similarity index 100% rename from include/lsMarchingCubes.hpp rename to include/viennals/lsMarchingCubes.hpp diff --git a/include/lsMarkVoidPoints.hpp b/include/viennals/lsMarkVoidPoints.hpp similarity index 100% rename from include/lsMarkVoidPoints.hpp rename to include/viennals/lsMarkVoidPoints.hpp diff --git a/include/lsMaterialMap.hpp b/include/viennals/lsMaterialMap.hpp similarity index 100% rename from include/lsMaterialMap.hpp rename to include/viennals/lsMaterialMap.hpp diff --git a/include/lsMesh.hpp b/include/viennals/lsMesh.hpp similarity index 100% rename from include/lsMesh.hpp rename to include/viennals/lsMesh.hpp diff --git a/include/lsMessage.hpp b/include/viennals/lsMessage.hpp similarity index 100% rename from include/lsMessage.hpp rename to include/viennals/lsMessage.hpp diff --git a/include/lsPointData.hpp b/include/viennals/lsPointData.hpp similarity index 100% rename from include/lsPointData.hpp rename to include/viennals/lsPointData.hpp diff --git a/include/lsPreCompileMacros.hpp b/include/viennals/lsPreCompileMacros.hpp similarity index 100% rename from include/lsPreCompileMacros.hpp rename to include/viennals/lsPreCompileMacros.hpp diff --git a/include/lsPrune.hpp b/include/viennals/lsPrune.hpp similarity index 100% rename from include/lsPrune.hpp rename to include/viennals/lsPrune.hpp diff --git a/include/lsReader.hpp b/include/viennals/lsReader.hpp similarity index 100% rename from include/lsReader.hpp rename to include/viennals/lsReader.hpp diff --git a/include/lsReduce.hpp b/include/viennals/lsReduce.hpp similarity index 100% rename from include/lsReduce.hpp rename to include/viennals/lsReduce.hpp diff --git a/include/lsRemoveStrayPoints.hpp b/include/viennals/lsRemoveStrayPoints.hpp similarity index 100% rename from include/lsRemoveStrayPoints.hpp rename to include/viennals/lsRemoveStrayPoints.hpp diff --git a/include/lsSmartPointer.hpp b/include/viennals/lsSmartPointer.hpp similarity index 100% rename from include/lsSmartPointer.hpp rename to include/viennals/lsSmartPointer.hpp diff --git a/include/lsStencilLocalLaxFriedrichsScalar.hpp b/include/viennals/lsStencilLocalLaxFriedrichsScalar.hpp similarity index 100% rename from include/lsStencilLocalLaxFriedrichsScalar.hpp rename to include/viennals/lsStencilLocalLaxFriedrichsScalar.hpp diff --git a/include/lsTestAsserts.hpp b/include/viennals/lsTestAsserts.hpp similarity index 100% rename from include/lsTestAsserts.hpp rename to include/viennals/lsTestAsserts.hpp diff --git a/include/lsToDiskMesh.hpp b/include/viennals/lsToDiskMesh.hpp similarity index 100% rename from include/lsToDiskMesh.hpp rename to include/viennals/lsToDiskMesh.hpp diff --git a/include/lsToMesh.hpp b/include/viennals/lsToMesh.hpp similarity index 100% rename from include/lsToMesh.hpp rename to include/viennals/lsToMesh.hpp diff --git a/include/lsToSurfaceMesh.hpp b/include/viennals/lsToSurfaceMesh.hpp similarity index 100% rename from include/lsToSurfaceMesh.hpp rename to include/viennals/lsToSurfaceMesh.hpp diff --git a/include/lsToVoxelMesh.hpp b/include/viennals/lsToVoxelMesh.hpp similarity index 100% rename from include/lsToVoxelMesh.hpp rename to include/viennals/lsToVoxelMesh.hpp diff --git a/include/lsTransformMesh.hpp b/include/viennals/lsTransformMesh.hpp similarity index 100% rename from include/lsTransformMesh.hpp rename to include/viennals/lsTransformMesh.hpp diff --git a/include/lsVTKReader.hpp b/include/viennals/lsVTKReader.hpp similarity index 100% rename from include/lsVTKReader.hpp rename to include/viennals/lsVTKReader.hpp diff --git a/include/lsVTKWriter.hpp b/include/viennals/lsVTKWriter.hpp similarity index 100% rename from include/lsVTKWriter.hpp rename to include/viennals/lsVTKWriter.hpp diff --git a/include/lsVelocityField.hpp b/include/viennals/lsVelocityField.hpp similarity index 100% rename from include/lsVelocityField.hpp rename to include/viennals/lsVelocityField.hpp diff --git a/include/lsWriteVisualizationMesh.hpp b/include/viennals/lsWriteVisualizationMesh.hpp similarity index 100% rename from include/lsWriteVisualizationMesh.hpp rename to include/viennals/lsWriteVisualizationMesh.hpp diff --git a/include/lsWriter.hpp b/include/viennals/lsWriter.hpp similarity index 100% rename from include/lsWriter.hpp rename to include/viennals/lsWriter.hpp