[cmake-format] ProcessLib/* CMakeLists.txt

cbaba76e · Lars Bilke · 918ba477 · cbaba76e · cbaba76e · cbaba76e
Verified Commit cbaba76e authored 4 years ago by Lars Bilke
--- a/.cmake-format.yaml
+++ b/.cmake-format.yaml
@@ -16,6 +16,9 @@ parse:
    - set_property
    - - cmdline
  additional_commands:
+    ogs_add_library:
+      pargs:
+        nargs: 2+
    addtest:
      pargs:
        nargs: '*'

--- a/ProcessLib/BoundaryCondition/Python/CMakeLists.txt
+++ b/ProcessLib/BoundaryCondition/Python/CMakeLists.txt
-ogs_add_library(ProcessLibBoundaryConditionPython
+ogs_add_library(
-            PythonBoundaryCondition.cpp
+    ProcessLibBoundaryConditionPython
-            PythonBoundaryCondition.h
+    PythonBoundaryCondition.cpp
-            PythonBoundaryConditionLocalAssembler.h
+    PythonBoundaryCondition.h
-            PythonBoundaryConditionPythonSideInterface.h
+    PythonBoundaryConditionLocalAssembler.h
-            BHEInflowPythonBoundaryCondition.h
+    PythonBoundaryConditionPythonSideInterface.h
-            BHEInflowPythonBoundaryConditionPythonSideInterface.h)
+    BHEInflowPythonBoundaryCondition.h
+    BHEInflowPythonBoundaryConditionPythonSideInterface.h
+)
-target_compile_definitions(ProcessLibBoundaryConditionPython
+target_compile_definitions(
-    PUBLIC
+    ProcessLibBoundaryConditionPython
-    OGS_USE_PYTHON
+    PUBLIC OGS_USE_PYTHON
-    # Enabled elements
+           # Enabled elements
-    OGS_MAX_ELEMENT_DIM=${OGS_MAX_ELEMENT_DIM}
+           OGS_MAX_ELEMENT_DIM=${OGS_MAX_ELEMENT_DIM}
-    OGS_MAX_ELEMENT_ORDER=${OGS_MAX_ELEMENT_ORDER}
+           OGS_MAX_ELEMENT_ORDER=${OGS_MAX_ELEMENT_ORDER}
-    $<$<BOOL:${OGS_ENABLE_ELEMENT_SIMPLEX}>:OGS_ENABLE_ELEMENT_SIMPLEX>
+           $<$<BOOL:${OGS_ENABLE_ELEMENT_SIMPLEX}>:OGS_ENABLE_ELEMENT_SIMPLEX>
-    $<$<BOOL:${OGS_ENABLE_ELEMENT_CUBOID}>:OGS_ENABLE_ELEMENT_CUBOID>
+           $<$<BOOL:${OGS_ENABLE_ELEMENT_CUBOID}>:OGS_ENABLE_ELEMENT_CUBOID>
-    $<$<BOOL:${OGS_ENABLE_ELEMENT_PRISM}>:OGS_ENABLE_ELEMENT_PRISM>
+           $<$<BOOL:${OGS_ENABLE_ELEMENT_PRISM}>:OGS_ENABLE_ELEMENT_PRISM>
-    $<$<BOOL:${OGS_ENABLE_ELEMENT_PYRAMID}>:OGS_ENABLE_ELEMENT_PYRAMID>
+           $<$<BOOL:${OGS_ENABLE_ELEMENT_PYRAMID}>:OGS_ENABLE_ELEMENT_PYRAMID>
 )
 target_link_libraries(
-    ProcessLibBoundaryConditionPython
+    ProcessLibBoundaryConditionPython PUBLIC BaseLib MathLib MeshLib NumLib
-    PUBLIC BaseLib MathLib MeshLib NumLib ${Python3_LIBRARIES}
+                                             ${Python3_LIBRARIES}
-    PRIVATE pybind11::pybind11 spdlog::spdlog)
+    PRIVATE pybind11::pybind11 spdlog::spdlog
+)
 # For the embedded Python module
-ogs_add_library(ProcessLibBoundaryConditionPythonModule
+ogs_add_library(
-            PythonBoundaryConditionModule.cpp PythonBoundaryConditionModule.h
+    ProcessLibBoundaryConditionPythonModule PythonBoundaryConditionModule.cpp
-            BHEInflowPythonBoundaryConditionModule.cpp
+    PythonBoundaryConditionModule.h BHEInflowPythonBoundaryConditionModule.cpp
-            BHEInflowPythonBoundaryConditionModule.h)
+    BHEInflowPythonBoundaryConditionModule.h
+)
-target_link_libraries(ProcessLibBoundaryConditionPythonModule
+target_link_libraries(
-                      PUBLIC ProcessLibBoundaryConditionPython
+    ProcessLibBoundaryConditionPythonModule
-                             pybind11::pybind11)
+    PUBLIC ProcessLibBoundaryConditionPython pybind11::pybind11
+)
--- a/ProcessLib/HeatTransportBHE/CMakeLists.txt
+++ b/ProcessLib/HeatTransportBHE/CMakeLists.txt
@@ -5,12 +5,10 @@ append_source_files(SOURCES LocalAssemblers)
 ogs_add_library(HeatTransportBHE ${SOURCES})
-target_link_libraries(HeatTransportBHE
+target_link_libraries(
-    PUBLIC
+    HeatTransportBHE PUBLIC ProcessLib
-        ProcessLib
+    PRIVATE ParameterLib
-    PRIVATE
+            $<$<TARGET_EXISTS:pybind11::pybind11>:pybind11::pybind11>
-    ParameterLib
-    $<$<TARGET_EXISTS:pybind11::pybind11>:pybind11::pybind11>
 )
 if(OGS_BUILD_TESTING)

--- a/ProcessLib/RichardsComponentTransport/CMakeLists.txt
+++ b/ProcessLib/RichardsComponentTransport/CMakeLists.txt
 get_source_files(SOURCES)
 ogs_add_library(RichardsComponentTransport ${SOURCES})
-target_link_libraries(RichardsComponentTransport
+target_link_libraries(
-                      PUBLIC ProcessLib
+    RichardsComponentTransport PUBLIC ProcessLib PRIVATE ParameterLib
-                      PRIVATE ParameterLib)
+)
 if(OGS_BUILD_TESTING)
    include(Tests.cmake)

--- a/ProcessLib/SmallDeformationNonlocal/CMakeLists.txt
+++ b/ProcessLib/SmallDeformationNonlocal/CMakeLists.txt
 get_source_files(SOURCES)
 ogs_add_library(SmallDeformationNonlocal ${SOURCES})
-target_link_libraries(SmallDeformationNonlocal
+target_link_libraries(
-                      PUBLIC ProcessLib
+    SmallDeformationNonlocal PUBLIC ProcessLib PRIVATE ParameterLib
-                      PRIVATE ParameterLib)
+)
 if(OGS_BUILD_TESTING)
    include(Tests.cmake)

--- a/ProcessLib/SourceTerms/Python/CMakeLists.txt
+++ b/ProcessLib/SourceTerms/Python/CMakeLists.txt
-ogs_add_library(ProcessLibSourceTermPython
+ogs_add_library(
-                CreatePythonSourceTerm.cpp
+    ProcessLibSourceTermPython
-                CreatePythonSourceTerm.h
+    CreatePythonSourceTerm.cpp
-                PythonSourceTerm.cpp
+    CreatePythonSourceTerm.h
-                PythonSourceTerm.h
+    PythonSourceTerm.cpp
-                PythonSourceTermLocalAssembler.h
+    PythonSourceTerm.h
-                PythonSourceTermPythonSideInterface.h)
+    PythonSourceTermLocalAssembler.h
+    PythonSourceTermPythonSideInterface.h
+)
-target_compile_definitions(ProcessLibSourceTermPython
+target_compile_definitions(
-    PUBLIC
+    ProcessLibSourceTermPython
-    OGS_USE_PYTHON
+    PUBLIC OGS_USE_PYTHON
-    # Enabled elements
+           # Enabled elements
-    OGS_MAX_ELEMENT_DIM=${OGS_MAX_ELEMENT_DIM}
+           OGS_MAX_ELEMENT_DIM=${OGS_MAX_ELEMENT_DIM}
-    OGS_MAX_ELEMENT_ORDER=${OGS_MAX_ELEMENT_ORDER}
+           OGS_MAX_ELEMENT_ORDER=${OGS_MAX_ELEMENT_ORDER}
-    $<$<BOOL:${OGS_ENABLE_ELEMENT_SIMPLEX}>:OGS_ENABLE_ELEMENT_SIMPLEX>
+           $<$<BOOL:${OGS_ENABLE_ELEMENT_SIMPLEX}>:OGS_ENABLE_ELEMENT_SIMPLEX>
-    $<$<BOOL:${OGS_ENABLE_ELEMENT_CUBOID}>:OGS_ENABLE_ELEMENT_CUBOID>
+           $<$<BOOL:${OGS_ENABLE_ELEMENT_CUBOID}>:OGS_ENABLE_ELEMENT_CUBOID>
-    $<$<BOOL:${OGS_ENABLE_ELEMENT_PRISM}>:OGS_ENABLE_ELEMENT_PRISM>
+           $<$<BOOL:${OGS_ENABLE_ELEMENT_PRISM}>:OGS_ENABLE_ELEMENT_PRISM>
-    $<$<BOOL:${OGS_ENABLE_ELEMENT_PYRAMID}>:OGS_ENABLE_ELEMENT_PYRAMID>
+           $<$<BOOL:${OGS_ENABLE_ELEMENT_PYRAMID}>:OGS_ENABLE_ELEMENT_PYRAMID>
 )
 target_link_libraries(
-    ProcessLibSourceTermPython
+    ProcessLibSourceTermPython PUBLIC BaseLib MathLib MeshLib NumLib
-    PUBLIC BaseLib MathLib MeshLib NumLib ${Python3_LIBRARIES}
+                                      ${Python3_LIBRARIES}
-    PRIVATE pybind11::pybind11 spdlog::spdlog)
+    PRIVATE pybind11::pybind11 spdlog::spdlog
+)
 # For the embedded Python module
-ogs_add_library(ProcessLibSourceTermPythonModule PythonSourceTermModule.cpp
+ogs_add_library(
-                                                 PythonSourceTermModule.h)
+    ProcessLibSourceTermPythonModule PythonSourceTermModule.cpp
+    PythonSourceTermModule.h
+)
-target_link_libraries(ProcessLibSourceTermPythonModule
+target_link_libraries(
-                      PUBLIC ProcessLibSourceTermPython pybind11::pybind11)
+    ProcessLibSourceTermPythonModule PUBLIC ProcessLibSourceTermPython
+                                            pybind11::pybind11
+)
--- a/ProcessLib/SteadyStateDiffusion/CMakeLists.txt
+++ b/ProcessLib/SteadyStateDiffusion/CMakeLists.txt
@@ -2,7 +2,8 @@ get_source_files(SOURCES)
 ogs_add_library(SteadyStateDiffusion ${SOURCES})
-target_link_libraries(SteadyStateDiffusion PUBLIC ProcessLib
+target_link_libraries(
-    PRIVATE ParameterLib)
+    SteadyStateDiffusion PUBLIC ProcessLib PRIVATE ParameterLib
+)
 include(Tests.cmake)
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CMakeLists.txt
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CMakeLists.txt
@@ -3,11 +3,12 @@ get_source_files(SOURCES)
 ogs_add_library(ThermalTwoPhaseFlowWithPP ${SOURCES})
 if(BUILD_SHARED_LIBS)
    install(TARGETS ThermalTwoPhaseFlowWithPP
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    )
 endif()
-target_link_libraries(ThermalTwoPhaseFlowWithPP
+target_link_libraries(
-                      PUBLIC ProcessLib
+    ThermalTwoPhaseFlowWithPP PUBLIC ProcessLib PRIVATE ParameterLib
-                      PRIVATE ParameterLib)
+)
 if(OGS_BUILD_TESTING)
    include(Tests.cmake)

--- a/ProcessLib/ThermoHydroMechanics/CMakeLists.txt
+++ b/ProcessLib/ThermoHydroMechanics/CMakeLists.txt
 get_source_files(SOURCES)
 ogs_add_library(ThermoHydroMechanics ${SOURCES})
-target_link_libraries(ThermoHydroMechanics
+target_link_libraries(
-                      PUBLIC ProcessLib
+    ThermoHydroMechanics PUBLIC ProcessLib PRIVATE ParameterLib
-                      PRIVATE ParameterLib)
+)
 if(OGS_BUILD_TESTING)
    include(Tests.cmake)

--- a/ProcessLib/ThermoMechanicalPhaseField/CMakeLists.txt
+++ b/ProcessLib/ThermoMechanicalPhaseField/CMakeLists.txt
 get_source_files(SOURCES)
 ogs_add_library(ThermoMechanicalPhaseField ${SOURCES})
-target_link_libraries(ThermoMechanicalPhaseField
+target_link_libraries(
-                      PUBLIC ProcessLib
+    ThermoMechanicalPhaseField PUBLIC ProcessLib PRIVATE ParameterLib
-                      PRIVATE ParameterLib)
+)
 if(OGS_BUILD_TESTING)
    include(Tests.cmake)

--- a/ProcessLib/ThermoRichardsMechanics/CMakeLists.txt
+++ b/ProcessLib/ThermoRichardsMechanics/CMakeLists.txt
 get_source_files(SOURCES)
 ogs_add_library(ThermoRichardsMechanics ${SOURCES})
-target_link_libraries(ThermoRichardsMechanics PUBLIC ProcessLib PRIVATE ParameterLib)
+target_link_libraries(
+    ThermoRichardsMechanics PUBLIC ProcessLib PRIVATE ParameterLib
+)
 if(OGS_BUILD_TESTING)
    include(Tests.cmake)

--- a/ProcessLib/TwoPhaseFlowWithPrho/CMakeLists.txt
+++ b/ProcessLib/TwoPhaseFlowWithPrho/CMakeLists.txt
 get_source_files(SOURCES)
 ogs_add_library(TwoPhaseFlowWithPrho ${SOURCES})
-target_link_libraries(TwoPhaseFlowWithPrho
+target_link_libraries(
-                      PUBLIC ProcessLib
+    TwoPhaseFlowWithPrho PUBLIC ProcessLib PRIVATE ParameterLib
-                      PRIVATE ParameterLib)
+)
 if(OGS_BUILD_TESTING)
    include(Tests.cmake)