[cmake-format] Remaining CMakeLists.txt

BaseLib/CMakeLists.txt

@@ -8,15 +8,17 @@ endif()
 # Create the library
 ogs_add_library(BaseLib ${SOURCES})
 
-target_link_libraries(BaseLib PUBLIC Boost::boost
-                                     spdlog::spdlog
-                                     std::filesystem
-                                     $<$<BOOL:${MSVC}>:WinMM> # needed for timeGetTime
-                                     $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::Xml>
-                                     $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::XmlPatterns>
+target_link_libraries(
+    BaseLib
+    PUBLIC Boost::boost
+           spdlog::spdlog
+           std::filesystem
+           $<$<BOOL:${MSVC}>:WinMM> # needed for timeGetTime
+           $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::Xml>
+           $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::XmlPatterns>
 )
 
-target_compile_definitions(BaseLib
-    PUBLIC $<$<BOOL:${OGS_FATAL_ABORT}>:OGS_FATAL_ABORT>
+target_compile_definitions(
+    BaseLib PUBLIC $<$<BOOL:${OGS_FATAL_ABORT}>:OGS_FATAL_ABORT>
     PRIVATE $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
 )

ChemistryLib/CMakeLists.txt

@@ -7,10 +7,12 @@ append_source_files(SOURCES Common)
 # Create the library
 ogs_add_library(ChemistryLib ${SOURCES})
 
-target_link_libraries(ChemistryLib PUBLIC iphreeqc PRIVATE NumLib spdlog::spdlog)
+target_link_libraries(
+    ChemistryLib PUBLIC iphreeqc PRIVATE NumLib spdlog::spdlog
+)
 
 # See https://github.com/ufz/ogs/pull/2982#issuecomment-641086788
-set_source_files_properties(PhreeqcIO.cpp
-    CreateChemicalSolverInterface.cpp
-    PhreeqcKernel.cpp
-    PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
+set_source_files_properties(
+    PhreeqcIO.cpp CreateChemicalSolverInterface.cpp PhreeqcKernel.cpp
+    PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
+)

GeoLib/CMakeLists.txt

@@ -12,21 +12,22 @@ endif()
 # Create the library
 ogs_add_library(GeoLib ${SOURCES})
 
-target_link_libraries(GeoLib
-    PUBLIC
-        BaseLib
-        MathLib
-        $<$<BOOL:${OGS_BUILD_GUI}>:rapidxml>
-        $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::Xml>
-        $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::XmlPatterns>
-    PRIVATE
-        tet
-        spdlog::spdlog
+target_link_libraries(
+    GeoLib
+    PUBLIC BaseLib MathLib $<$<BOOL:${OGS_BUILD_GUI}>:rapidxml>
+           $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::Xml>
+           $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::XmlPatterns>
+    PRIVATE tet spdlog::spdlog
 )
 
-configure_file(IO/XmlIO/OpenGeoSysGLI.xsd
-               ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysGLI.xsd COPYONLY)
-configure_file(IO/XmlIO/OpenGeoSysSTN.xsd
-               ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysSTN.xsd COPYONLY)
+configure_file(
+    IO/XmlIO/OpenGeoSysGLI.xsd
+    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysGLI.xsd COPYONLY
+)
+configure_file(
+    IO/XmlIO/OpenGeoSysSTN.xsd
+    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysSTN.xsd COPYONLY
+)
 install(FILES IO/XmlIO/OpenGeoSysGLI.xsd IO/XmlIO/OpenGeoSysSTN.xsd
-        DESTINATION bin)
+        DESTINATION bin
+)

InfoLib/CMakeLists.txt

 foreach(lib Git CMake Test)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${lib}Info.cpp.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp @ONLY)
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/${lib}Info.cpp.in
+        ${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp @ONLY
+    )
 
-    ogs_add_library(${lib}InfoLib ${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp
-                              ${lib}Info.h)
+    ogs_add_library(
+        ${lib}InfoLib ${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp ${lib}Info.h
+    )
 
     target_include_directories(${lib}InfoLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 endforeach(lib)

MaterialLib/CMakeLists.txt

@@ -29,8 +29,9 @@ append_source_files(SOURCES PorousMedium/Porosity)
 append_source_files(SOURCES PorousMedium/Storage)
 append_source_files(SOURCES PorousMedium/Permeability)
 append_source_files(SOURCES PorousMedium/UnsaturatedProperty/CapillaryPressure)
-append_source_files(SOURCES
-                    PorousMedium/UnsaturatedProperty/RelativePermeability)
+append_source_files(
+    SOURCES PorousMedium/UnsaturatedProperty/RelativePermeability
+)
 append_source_files(SOURCES TwoPhaseModels)
 
 if(OGS_USE_MFRONT)
@@ -42,12 +43,9 @@ ogs_add_library(MaterialLib ${SOURCES})
 if(OGS_USE_MFRONT)
     target_compile_definitions(MaterialLib PUBLIC OGS_USE_MFRONT)
 endif()
-target_link_libraries(MaterialLib
+target_link_libraries(
+    MaterialLib
     PUBLIC
         $<$<TARGET_EXISTS:MaterialLib_SolidModels_MFront>:MaterialLib_SolidModels_MFront>
-    PRIVATE
-        MathLib
-        MeshLib
-        ParameterLib
-        spdlog::spdlog
+    PRIVATE MathLib MeshLib ParameterLib spdlog::spdlog
 )

MaterialLib/SolidModels/MFront/CMakeLists.txt

@@ -18,25 +18,30 @@ mfront_behaviours_check_library(
     MohrCoulombAbboSloanUBI
     MohrCoulombAbboSloanUBIOrtho
     StandardElasticityBrick
-    StandardElasticityBrickOrtho)
+    StandardElasticityBrickOrtho
+)
 
 target_link_libraries(
-    MaterialLib_SolidModels_MFront
-    PUBLIC BaseLib NumLib OgsMFrontBehaviour
-    PRIVATE MathLib MeshLib spdlog::spdlog)
+    MaterialLib_SolidModels_MFront PUBLIC BaseLib NumLib OgsMFrontBehaviour
+    PRIVATE MathLib MeshLib spdlog::spdlog
+)
 
 # Disable warnings for generated OgsMFrontBehaviour
 target_compile_options(
     OgsMFrontBehaviour
     PRIVATE
         $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:-w>
-        $<$<CXX_COMPILER_ID:MSVC>:/W0>)
+        $<$<CXX_COMPILER_ID:MSVC>:/W0>
+)
 
-target_include_directories(MaterialLib_SolidModels_MFront
-                           PUBLIC ThirdParty/MGIS/include)
-target_link_libraries(MaterialLib_SolidModels_MFront
-                      PUBLIC MFrontGenericInterface)
-target_compile_definitions(MaterialLib_SolidModels_MFront
-                           PRIVATE OGS_USE_MFRONT)
+target_include_directories(
+    MaterialLib_SolidModels_MFront PUBLIC ThirdParty/MGIS/include
+)
+target_link_libraries(
+    MaterialLib_SolidModels_MFront PUBLIC MFrontGenericInterface
+)
+target_compile_definitions(
+    MaterialLib_SolidModels_MFront PRIVATE OGS_USE_MFRONT
+)
 
 install(TARGETS MFrontGenericInterface OgsMFrontBehaviour)

MathLib/CMakeLists.txt

@@ -22,24 +22,22 @@ endif()
 
 # Create the library
 ogs_add_library(MathLib ${SOURCES})
-target_include_directories(MathLib
-    PUBLIC
-        ${CMAKE_CURRENT_BINARY_DIR}
-        $<$<BOOL:${OGS_USE_PETSC}>:${PETSC_INCLUDE_DIRS}>
+target_include_directories(
+    MathLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
+                   $<$<BOOL:${OGS_USE_PETSC}>:${PETSC_INCLUDE_DIRS}>
 )
 
 set_target_properties(MathLib PROPERTIES LINKER_LANGUAGE CXX)
 
-target_link_libraries(MathLib
-    PUBLIC
-        BaseLib
-        ${OpenMP_CXX_LIBRARIES}
-        $<$<TARGET_EXISTS:LAPACK::LAPACK>:LAPACK::LAPACK>
-        $<$<BOOL:${OGS_USE_LIS}>:${LIS_LIBRARIES}>
-        $<$<BOOL:${OGS_USE_CVODE}>:CVODE::CVODE>
-        Eigen3::Eigen
-    PRIVATE
-        spdlog::spdlog
+target_link_libraries(
+    MathLib
+    PUBLIC BaseLib
+           ${OpenMP_CXX_LIBRARIES}
+           $<$<TARGET_EXISTS:LAPACK::LAPACK>:LAPACK::LAPACK>
+           $<$<BOOL:${OGS_USE_LIS}>:${LIS_LIBRARIES}>
+           $<$<BOOL:${OGS_USE_CVODE}>:CVODE::CVODE>
+           Eigen3::Eigen
+    PRIVATE spdlog::spdlog
 )
 
 if(OGS_USE_PETSC)
@@ -49,11 +47,9 @@ if(OGS_USE_MKL)
     target_link_libraries(MathLib PUBLIC ${MKL_LIBRARIES})
 endif()
 
-target_compile_definitions(MathLib
-    PUBLIC
-    $<$<BOOL:${USE_LIS}>:USE_LIS>
-    $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
-    $<$<BOOL:${OGS_USE_CVODE}>:CVODE_FOUND>
-    PRIVATE
-    $<$<BOOL:${OGS_USE_MKL}>:USE_MKL>
+target_compile_definitions(
+    MathLib
+    PUBLIC $<$<BOOL:${USE_LIS}>:USE_LIS> $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
+           $<$<BOOL:${OGS_USE_CVODE}>:CVODE_FOUND>
+    PRIVATE $<$<BOOL:${OGS_USE_MKL}>:USE_MKL>
 )

MeshGeoToolsLib/CMakeLists.txt

@@ -4,6 +4,7 @@ get_source_files(SOURCES)
 # Create the library
 ogs_add_library(MeshGeoToolsLib ${SOURCES})
 
-target_link_libraries(MeshGeoToolsLib
-                      PUBLIC GeoLib MathLib
-                      PRIVATE BaseLib MeshLib spdlog::spdlog)
+target_link_libraries(
+    MeshGeoToolsLib PUBLIC GeoLib MathLib PRIVATE BaseLib MeshLib
+                                                  spdlog::spdlog
+)

MeshLib/CMakeLists.txt

@@ -33,20 +33,22 @@ ogs_add_library(MeshLib ${SOURCES})
 
 target_link_libraries(
     MeshLib
-    PUBLIC
-        BaseLib GeoLib GitInfoLib MathLib ${VTK_LIBRARIES}
-        $<$<TARGET_EXISTS:OgsXdmf>:OgsXdmf>
-        $<$<TARGET_EXISTS:MPI::MPI_CXX>:MPI::MPI_CXX>
-    PRIVATE
-        spdlog::spdlog
+    PUBLIC BaseLib
+           GeoLib
+           GitInfoLib
+           MathLib
+           ${VTK_LIBRARIES}
+           $<$<TARGET_EXISTS:OgsXdmf>:OgsXdmf>
+           $<$<TARGET_EXISTS:MPI::MPI_CXX>:MPI::MPI_CXX>
+    PRIVATE spdlog::spdlog
 )
 
 target_include_directories(MeshLib PUBLIC ${VTK_INCLUDE_DIRS})
 
-target_compile_definitions(MeshLib
+target_compile_definitions(
+    MeshLib
     PUBLIC
-    $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
-    $<$<AND:$<BOOL:$ENV{VTK_USE_64BIT_IDS}>,$<NOT:$<BOOL:VTK_ADDED>>>:VTK_USE_64BIT_IDS>
-    PRIVATE
-    $<$<BOOL:${OGS_USE_XDMF}>:OGS_USE_XDMF>
+        $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
+        $<$<AND:$<BOOL:$ENV{VTK_USE_64BIT_IDS}>,$<NOT:$<BOOL:VTK_ADDED>>>:VTK_USE_64BIT_IDS>
+    PRIVATE $<$<BOOL:${OGS_USE_XDMF}>:OGS_USE_XDMF>
 )

NumLib/CMakeLists.txt

@@ -22,6 +22,6 @@ endif()
 set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX)
 
 target_link_libraries(
-    NumLib
-    PUBLIC BaseLib GeoLib MathLib MeshLib
-    PRIVATE MeshGeoToolsLib spdlog::spdlog)
+    NumLib PUBLIC BaseLib GeoLib MathLib MeshLib PRIVATE MeshGeoToolsLib
+                                                         spdlog::spdlog
+)

ParameterLib/CMakeLists.txt

 get_source_files(SOURCES)
 ogs_add_library(ParameterLib ${SOURCES})
 
-target_link_libraries(ParameterLib
-    PUBLIC MathLib
-    PRIVATE BaseLib exprtk MeshLib spdlog::spdlog
+target_link_libraries(
+    ParameterLib PUBLIC MathLib PRIVATE BaseLib exprtk MeshLib spdlog::spdlog
 )

Tests/CMakeLists.txt

-### ctest dependencies
+# ctest dependencies
 foreach(tool vtkdiff xdmfdiff)
     if(TARGET ${tool})
         list(APPEND test_dependencies ${tool})
@@ -7,7 +7,7 @@ endforeach()
 add_dependencies(ctest ${test_dependencies})
 add_dependencies(ctest-large ${test_dependencies})
 
-### testrunner ###
+# testrunner ###
 
 # VS2012 doesn't support correctly the tuples yet See
 # http://code.google.com/p/googletest/issues/detail?id=412
@@ -26,7 +26,9 @@ append_source_files(TEST_SOURCES MeshLib)
 append_source_files(TEST_SOURCES MeshGeoToolsLib)
 append_source_files(TEST_SOURCES_NUMLIB NumLib)
 # Disable Unity build for NumLib tests
-set_source_files_properties(${TEST_SOURCES_NUMLIB} PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+set_source_files_properties(
+    ${TEST_SOURCES_NUMLIB} PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON
+)
 # Keep order of source files, otherwise PETSc non-MPI tests fail
 set(TEST_SOURCES ${TEST_SOURCES} ${TEST_SOURCES_NUMLIB})
 append_source_files(TEST_SOURCES ParameterLib)
@@ -54,26 +56,26 @@ endif()
 add_executable(testrunner ${TEST_SOURCES})
 set_target_properties(testrunner PROPERTIES FOLDER Testing)
 
-target_link_libraries(testrunner
-    PRIVATE
-        ApplicationsFileIO
-        autocheck
-        gtest
-        MeshGeoToolsLib
-        MaterialLib
-        MathLib
-        MeshLib
-        NumLib
-        ParameterLib
-        ProcessLib
-        Processes
-        TestInfoLib
-        Threads::Threads
-        ${VTK_LIBRARIES}
-        $<$<TARGET_EXISTS:LIE>:LIE>
-        $<$<TARGET_EXISTS:MPI::MPI_CXX>:MPI::MPI_CXX>
-        $<$<TARGET_EXISTS:SwmmInterface>:SwmmInterface>
-        $<$<TARGET_EXISTS:InSituLib>:InSituLib>
+target_link_libraries(
+    testrunner
+    PRIVATE ApplicationsFileIO
+            autocheck
+            gtest
+            MeshGeoToolsLib
+            MaterialLib
+            MathLib
+            MeshLib
+            NumLib
+            ParameterLib
+            ProcessLib
+            Processes
+            TestInfoLib
+            Threads::Threads
+            ${VTK_LIBRARIES}
+            $<$<TARGET_EXISTS:LIE>:LIE>
+            $<$<TARGET_EXISTS:MPI::MPI_CXX>:MPI::MPI_CXX>
+            $<$<TARGET_EXISTS:SwmmInterface>:SwmmInterface>
+            $<$<TARGET_EXISTS:InSituLib>:InSituLib>
 )
 
 if(OGS_USE_PETSC)
@@ -82,15 +84,15 @@ endif()
 
 if(OGS_BUILD_GUI)
     target_compile_definitions(testrunner PUBLIC OGS_BUILD_GUI)
-    target_link_libraries(testrunner
-        PRIVATE
-            GitInfoLib
-            Qt5::Core
-            Qt5::Gui
-            Qt5::Xml
-            Qt5::Network
-            VtkVis
-            QtDataView
+    target_link_libraries(
+        testrunner
+        PRIVATE GitInfoLib
+                Qt5::Core
+                Qt5::Gui
+                Qt5::Xml
+                Qt5::Network
+                VtkVis
+                QtDataView
     )
     if(GEOTIFF_FOUND)
         target_link_libraries(testrunner PRIVATE ${GEOTIFF_LIBRARIES})