From be1f66026cdab7fb455c82917dde8f8f1cc53264 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Wed, 14 Aug 2019 11:36:18 +0200 Subject: [PATCH] [cmake] format ProcessLib/ --- BaseLib/CMakeLists.txt | 8 ++-- .../BoundaryCondition/Python/CMakeLists.txt | 32 ++++++++------- ProcessLib/CMakeLists.txt | 40 ++++++++----------- ProcessLib/ComponentTransport/CMakeLists.txt | 10 ++--- ProcessLib/GroundwaterFlow/CMakeLists.txt | 7 +--- ProcessLib/HT/CMakeLists.txt | 7 +--- ProcessLib/HeatConduction/CMakeLists.txt | 7 +--- ProcessLib/HeatTransportBHE/CMakeLists.txt | 16 ++++---- ProcessLib/HydroMechanics/CMakeLists.txt | 7 +--- ProcessLib/LIE/CMakeLists.txt | 13 +++--- ProcessLib/LIE/Common/CMakeLists.txt | 2 +- ProcessLib/LiquidFlow/CMakeLists.txt | 7 +--- ProcessLib/PhaseField/CMakeLists.txt | 7 +--- .../RichardsComponentTransport/CMakeLists.txt | 10 ++--- ProcessLib/RichardsFlow/CMakeLists.txt | 7 +--- ProcessLib/RichardsMechanics/CMakeLists.txt | 10 ++--- ProcessLib/SmallDeformation/CMakeLists.txt | 10 ++--- .../SmallDeformationNonlocal/CMakeLists.txt | 10 ++--- ProcessLib/SourceTerms/Python/CMakeLists.txt | 37 ++++++++--------- ProcessLib/TES/CMakeLists.txt | 7 +--- .../ThermalTwoPhaseFlowWithPP/CMakeLists.txt | 10 ++--- .../ThermoHydroMechanics/CMakeLists.txt | 10 ++--- .../ThermoMechanicalPhaseField/CMakeLists.txt | 10 ++--- ProcessLib/ThermoMechanics/CMakeLists.txt | 7 +--- ProcessLib/TwoPhaseFlowWithPP/CMakeLists.txt | 10 ++--- .../TwoPhaseFlowWithPrho/CMakeLists.txt | 10 ++--- 26 files changed, 135 insertions(+), 176 deletions(-) diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt index 52f8a8e03db..b84f20bc1aa 100644 --- a/BaseLib/CMakeLists.txt +++ b/BaseLib/CMakeLists.txt @@ -1,10 +1,10 @@ -GET_SOURCE_FILES(SOURCES) -APPEND_SOURCE_FILES(SOURCES IO) +get_source_files(SOURCES) +append_source_files(SOURCES IO) -APPEND_SOURCE_FILES(SOURCES IO/XmlIO) +append_source_files(SOURCES IO/XmlIO) if(OGS_BUILD_GUI) - APPEND_SOURCE_FILES(SOURCES IO/XmlIO/Qt) + append_source_files(SOURCES IO/XmlIO/Qt) endif() list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.cpp" BuildInfo.h) diff --git a/ProcessLib/BoundaryCondition/Python/CMakeLists.txt b/ProcessLib/BoundaryCondition/Python/CMakeLists.txt index 94dcceacb37..e8b743be320 100644 --- a/ProcessLib/BoundaryCondition/Python/CMakeLists.txt +++ b/ProcessLib/BoundaryCondition/Python/CMakeLists.txt @@ -1,30 +1,32 @@ add_library(ProcessLibBoundaryConditionPython - PythonBoundaryCondition.cpp - PythonBoundaryCondition.h - PythonBoundaryConditionLocalAssembler.h - PythonBoundaryConditionPythonSideInterface.h) + PythonBoundaryCondition.cpp PythonBoundaryCondition.h + PythonBoundaryConditionLocalAssembler.h + PythonBoundaryConditionPythonSideInterface.h) if(BUILD_SHARED_LIBS) install(TARGETS ProcessLibBoundaryConditionPython - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_compile_definitions(ProcessLibBoundaryConditionPython - PUBLIC OGS_USE_PYTHON) +target_compile_definitions(ProcessLibBoundaryConditionPython PUBLIC + OGS_USE_PYTHON) target_link_libraries(ProcessLibBoundaryConditionPython - PUBLIC BaseLib MathLib MeshLib NumLib logog ${Python_LIBRARIES} - PRIVATE pybind11::pybind11) + PUBLIC BaseLib + MathLib + MeshLib + NumLib + logog + ${Python_LIBRARIES} + PRIVATE pybind11::pybind11) # For the embedded Python module add_library(ProcessLibBoundaryConditionPythonModule - PythonBoundaryConditionModule.cpp - PythonBoundaryConditionModule.h) + PythonBoundaryConditionModule.cpp PythonBoundaryConditionModule.h) if(BUILD_SHARED_LIBS) install(TARGETS ProcessLibBoundaryConditionPythonModule - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() target_link_libraries(ProcessLibBoundaryConditionPythonModule - PUBLIC - ProcessLibBoundaryConditionPython - pybind11::pybind11) + PUBLIC ProcessLibBoundaryConditionPython + pybind11::pybind11) diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt index fac38bcd24d..893b163d52b 100644 --- a/ProcessLib/CMakeLists.txt +++ b/ProcessLib/CMakeLists.txt @@ -10,13 +10,12 @@ foreach(process ${ProcessesList}) endif() endforeach() - -APPEND_SOURCE_FILES(SOURCES) -APPEND_SOURCE_FILES(SOURCES BoundaryCondition) -APPEND_SOURCE_FILES(SOURCES SurfaceFlux) -APPEND_SOURCE_FILES(SOURCES Output) -APPEND_SOURCE_FILES(SOURCES SourceTerms) -APPEND_SOURCE_FILES(SOURCES Utils) +append_source_files(SOURCES) +append_source_files(SOURCES BoundaryCondition) +append_source_files(SOURCES SurfaceFlux) +append_source_files(SOURCES Output) +append_source_files(SOURCES SourceTerms) +append_source_files(SOURCES Utils) add_library(ProcessLib ${SOURCES}) if(BUILD_SHARED_LIBS) @@ -24,27 +23,22 @@ if(BUILD_SHARED_LIBS) endif() target_link_libraries(ProcessLib - PUBLIC - BaseLib - MaterialLib - MathLib - MeshGeoToolsLib - MeshLib - NumLib - logog - ChemistryLib - PRIVATE - ParameterLib -) + PUBLIC BaseLib + MaterialLib + MathLib + MeshGeoToolsLib + MeshLib + NumLib + logog + ChemistryLib + PRIVATE ParameterLib) if(OGS_USE_PYTHON) add_subdirectory(BoundaryCondition/Python) - target_link_libraries(ProcessLib - PUBLIC ProcessLibBoundaryConditionPython) + target_link_libraries(ProcessLib PUBLIC ProcessLibBoundaryConditionPython) add_subdirectory(SourceTerms/Python) - target_link_libraries(ProcessLib - PUBLIC ProcessLibSourceTermPython) + target_link_libraries(ProcessLib PUBLIC ProcessLibSourceTermPython) endif() if(OGS_INSITU) diff --git a/ProcessLib/ComponentTransport/CMakeLists.txt b/ProcessLib/ComponentTransport/CMakeLists.txt index 15a0a6a3c54..efc6c894edd 100644 --- a/ProcessLib/ComponentTransport/CMakeLists.txt +++ b/ProcessLib/ComponentTransport/CMakeLists.txt @@ -1,13 +1,11 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(ComponentTransport ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS ComponentTransport LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS ComponentTransport + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(ComponentTransport - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(ComponentTransport PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/GroundwaterFlow/CMakeLists.txt b/ProcessLib/GroundwaterFlow/CMakeLists.txt index c2aa630efeb..2b6fa539084 100644 --- a/ProcessLib/GroundwaterFlow/CMakeLists.txt +++ b/ProcessLib/GroundwaterFlow/CMakeLists.txt @@ -1,13 +1,10 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(GroundwaterFlow ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS GroundwaterFlow LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(GroundwaterFlow - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(GroundwaterFlow PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/HT/CMakeLists.txt b/ProcessLib/HT/CMakeLists.txt index 1cf1581847e..e063a35a9a4 100644 --- a/ProcessLib/HT/CMakeLists.txt +++ b/ProcessLib/HT/CMakeLists.txt @@ -1,12 +1,9 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(HT ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS HT LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(HT - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(HT PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/HeatConduction/CMakeLists.txt b/ProcessLib/HeatConduction/CMakeLists.txt index 5b1b842b98b..ab5a1b398af 100644 --- a/ProcessLib/HeatConduction/CMakeLists.txt +++ b/ProcessLib/HeatConduction/CMakeLists.txt @@ -1,12 +1,9 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(HeatConduction ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS HeatConduction LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(HeatConduction - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(HeatConduction PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/HeatTransportBHE/CMakeLists.txt b/ProcessLib/HeatTransportBHE/CMakeLists.txt index b9501a6007a..daa5a552549 100644 --- a/ProcessLib/HeatTransportBHE/CMakeLists.txt +++ b/ProcessLib/HeatTransportBHE/CMakeLists.txt @@ -1,15 +1,13 @@ -APPEND_SOURCE_FILES(SOURCES) -APPEND_SOURCE_FILES(SOURCES BHE) -APPEND_SOURCE_FILES(SOURCES BoundaryConditions) -APPEND_SOURCE_FILES(SOURCES LocalAssemblers) +append_source_files(SOURCES) +append_source_files(SOURCES BHE) +append_source_files(SOURCES BoundaryConditions) +append_source_files(SOURCES LocalAssemblers) add_library(HeatTransportBHE ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS HeatTransportBHE LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS HeatTransportBHE + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(HeatTransportBHE - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(HeatTransportBHE PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/HydroMechanics/CMakeLists.txt b/ProcessLib/HydroMechanics/CMakeLists.txt index 924a3aec796..1540a3a3583 100644 --- a/ProcessLib/HydroMechanics/CMakeLists.txt +++ b/ProcessLib/HydroMechanics/CMakeLists.txt @@ -1,12 +1,9 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(HydroMechanics ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS HydroMechanics LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(HydroMechanics - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(HydroMechanics PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/LIE/CMakeLists.txt b/ProcessLib/LIE/CMakeLists.txt index 8f82689a0e2..013de5c1731 100644 --- a/ProcessLib/LIE/CMakeLists.txt +++ b/ProcessLib/LIE/CMakeLists.txt @@ -1,17 +1,14 @@ add_subdirectory(Common) -APPEND_SOURCE_FILES(SOURCES HydroMechanics) -APPEND_SOURCE_FILES(SOURCES HydroMechanics/LocalAssembler) -APPEND_SOURCE_FILES(SOURCES SmallDeformation) -APPEND_SOURCE_FILES(SOURCES SmallDeformation/LocalAssembler) +append_source_files(SOURCES HydroMechanics) +append_source_files(SOURCES HydroMechanics/LocalAssembler) +append_source_files(SOURCES SmallDeformation) +append_source_files(SOURCES SmallDeformation/LocalAssembler) add_library(LIE ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS LIE LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(LIE - PUBLIC ProcessLib LIECommon - PRIVATE ParameterLib -) +target_link_libraries(LIE PUBLIC ProcessLib LIECommon PRIVATE ParameterLib) include(HydroMechanics/Tests.cmake) include(SmallDeformation/Tests.cmake) diff --git a/ProcessLib/LIE/Common/CMakeLists.txt b/ProcessLib/LIE/Common/CMakeLists.txt index 35b8683e7b7..807b396591c 100644 --- a/ProcessLib/LIE/Common/CMakeLists.txt +++ b/ProcessLib/LIE/Common/CMakeLists.txt @@ -1,4 +1,4 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(LIECommon ${SOURCES}) if(BUILD_SHARED_LIBS) diff --git a/ProcessLib/LiquidFlow/CMakeLists.txt b/ProcessLib/LiquidFlow/CMakeLists.txt index ff8694cc576..bfc4de97977 100644 --- a/ProcessLib/LiquidFlow/CMakeLists.txt +++ b/ProcessLib/LiquidFlow/CMakeLists.txt @@ -1,12 +1,9 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(LiquidFlow ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS LiquidFlow LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(LiquidFlow - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(LiquidFlow PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/PhaseField/CMakeLists.txt b/ProcessLib/PhaseField/CMakeLists.txt index 03c6de7205b..0923fa969b6 100644 --- a/ProcessLib/PhaseField/CMakeLists.txt +++ b/ProcessLib/PhaseField/CMakeLists.txt @@ -1,12 +1,9 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(PhaseField ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS PhaseField LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(PhaseField - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(PhaseField PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/RichardsComponentTransport/CMakeLists.txt b/ProcessLib/RichardsComponentTransport/CMakeLists.txt index 1727d576275..78d38e8fb11 100644 --- a/ProcessLib/RichardsComponentTransport/CMakeLists.txt +++ b/ProcessLib/RichardsComponentTransport/CMakeLists.txt @@ -1,12 +1,12 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(RichardsComponentTransport ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS RichardsComponentTransport LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS RichardsComponentTransport + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() target_link_libraries(RichardsComponentTransport - PUBLIC ProcessLib - PRIVATE ParameterLib -) + PUBLIC ProcessLib + PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/RichardsFlow/CMakeLists.txt b/ProcessLib/RichardsFlow/CMakeLists.txt index e0cf9f1684c..cb2110ef2f5 100644 --- a/ProcessLib/RichardsFlow/CMakeLists.txt +++ b/ProcessLib/RichardsFlow/CMakeLists.txt @@ -1,12 +1,9 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(RichardsFlow ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS RichardsFlow LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(RichardsFlow - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(RichardsFlow PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/RichardsMechanics/CMakeLists.txt b/ProcessLib/RichardsMechanics/CMakeLists.txt index 8dc36b502aa..78346233e41 100644 --- a/ProcessLib/RichardsMechanics/CMakeLists.txt +++ b/ProcessLib/RichardsMechanics/CMakeLists.txt @@ -1,12 +1,12 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(RichardsMechanics ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS RichardsMechanics LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS RichardsMechanics + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() target_link_libraries(RichardsMechanics - PUBLIC ProcessLib - PRIVATE RichardsFlow ParameterLib -) + PUBLIC ProcessLib + PRIVATE RichardsFlow ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/SmallDeformation/CMakeLists.txt b/ProcessLib/SmallDeformation/CMakeLists.txt index 462c3245b63..8895ecd5108 100644 --- a/ProcessLib/SmallDeformation/CMakeLists.txt +++ b/ProcessLib/SmallDeformation/CMakeLists.txt @@ -1,12 +1,10 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(SmallDeformation ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS SmallDeformation LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS SmallDeformation + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(SmallDeformation - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(SmallDeformation PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/SmallDeformationNonlocal/CMakeLists.txt b/ProcessLib/SmallDeformationNonlocal/CMakeLists.txt index aeb0fa859b7..cf8bba5b8f2 100644 --- a/ProcessLib/SmallDeformationNonlocal/CMakeLists.txt +++ b/ProcessLib/SmallDeformationNonlocal/CMakeLists.txt @@ -1,12 +1,12 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(SmallDeformationNonlocal ${SOURCES}) target_link_libraries(SmallDeformationNonlocal - PUBLIC ProcessLib - PRIVATE ParameterLib -) + PUBLIC ProcessLib + PRIVATE ParameterLib) if(BUILD_SHARED_LIBS) - install(TARGETS SmallDeformationNonlocal LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS SmallDeformationNonlocal + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() include(Tests.cmake) diff --git a/ProcessLib/SourceTerms/Python/CMakeLists.txt b/ProcessLib/SourceTerms/Python/CMakeLists.txt index 2fe58ad12a4..10caeb8e509 100644 --- a/ProcessLib/SourceTerms/Python/CMakeLists.txt +++ b/ProcessLib/SourceTerms/Python/CMakeLists.txt @@ -1,32 +1,33 @@ add_library(ProcessLibSourceTermPython - CreatePythonSourceTerm.cpp - CreatePythonSourceTerm.h - PythonSourceTerm.cpp - PythonSourceTerm.h - PythonSourceTermLocalAssembler.h - PythonSourceTermPythonSideInterface.h) + CreatePythonSourceTerm.cpp + CreatePythonSourceTerm.h + PythonSourceTerm.cpp + PythonSourceTerm.h + PythonSourceTermLocalAssembler.h + PythonSourceTermPythonSideInterface.h) if(BUILD_SHARED_LIBS) install(TARGETS ProcessLibSourceTermPython - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_compile_definitions(ProcessLibSourceTermPython - PUBLIC OGS_USE_PYTHON) +target_compile_definitions(ProcessLibSourceTermPython PUBLIC OGS_USE_PYTHON) target_link_libraries(ProcessLibSourceTermPython - PUBLIC BaseLib MathLib MeshLib NumLib logog ${Python_LIBRARIES} - PRIVATE pybind11::pybind11) + PUBLIC BaseLib + MathLib + MeshLib + NumLib + logog + ${Python_LIBRARIES} + PRIVATE pybind11::pybind11) # For the embedded Python module -add_library(ProcessLibSourceTermPythonModule - PythonSourceTermModule.cpp - PythonSourceTermModule.h) +add_library(ProcessLibSourceTermPythonModule PythonSourceTermModule.cpp + PythonSourceTermModule.h) if(BUILD_SHARED_LIBS) install(TARGETS ProcessLibSourceTermPythonModule - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() target_link_libraries(ProcessLibSourceTermPythonModule - PUBLIC - ProcessLibSourceTermPython - pybind11::pybind11) + PUBLIC ProcessLibSourceTermPython pybind11::pybind11) diff --git a/ProcessLib/TES/CMakeLists.txt b/ProcessLib/TES/CMakeLists.txt index afa13b23b39..4b8b5055bc8 100644 --- a/ProcessLib/TES/CMakeLists.txt +++ b/ProcessLib/TES/CMakeLists.txt @@ -1,12 +1,9 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(TES ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS TES LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(TES - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(TES PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CMakeLists.txt b/ProcessLib/ThermalTwoPhaseFlowWithPP/CMakeLists.txt index 9f2c0e49778..6997808b17e 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CMakeLists.txt +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CMakeLists.txt @@ -1,12 +1,12 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(ThermalTwoPhaseFlowWithPP ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS ThermalTwoPhaseFlowWithPP LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS ThermalTwoPhaseFlowWithPP + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() target_link_libraries(ThermalTwoPhaseFlowWithPP - PUBLIC ProcessLib - PRIVATE ParameterLib -) + PUBLIC ProcessLib + PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/ThermoHydroMechanics/CMakeLists.txt b/ProcessLib/ThermoHydroMechanics/CMakeLists.txt index 4abb37657ef..358eb90407b 100644 --- a/ProcessLib/ThermoHydroMechanics/CMakeLists.txt +++ b/ProcessLib/ThermoHydroMechanics/CMakeLists.txt @@ -1,12 +1,12 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(ThermoHydroMechanics ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS ThermoHydroMechanics LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS ThermoHydroMechanics + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() target_link_libraries(ThermoHydroMechanics - PUBLIC ProcessLib - PRIVATE ParameterLib -) + PUBLIC ProcessLib + PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/ThermoMechanicalPhaseField/CMakeLists.txt b/ProcessLib/ThermoMechanicalPhaseField/CMakeLists.txt index 9151b31a37f..8f7777a8a75 100644 --- a/ProcessLib/ThermoMechanicalPhaseField/CMakeLists.txt +++ b/ProcessLib/ThermoMechanicalPhaseField/CMakeLists.txt @@ -1,12 +1,12 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(ThermoMechanicalPhaseField ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS ThermoMechanicalPhaseField LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS ThermoMechanicalPhaseField + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() target_link_libraries(ThermoMechanicalPhaseField - PUBLIC ProcessLib - PRIVATE ParameterLib -) + PUBLIC ProcessLib + PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/ThermoMechanics/CMakeLists.txt b/ProcessLib/ThermoMechanics/CMakeLists.txt index 7b4955907f3..d8996ec7f11 100644 --- a/ProcessLib/ThermoMechanics/CMakeLists.txt +++ b/ProcessLib/ThermoMechanics/CMakeLists.txt @@ -1,12 +1,9 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(ThermoMechanics ${SOURCES}) if(BUILD_SHARED_LIBS) install(TARGETS ThermoMechanics LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(ThermoMechanics - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(ThermoMechanics PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/TwoPhaseFlowWithPP/CMakeLists.txt b/ProcessLib/TwoPhaseFlowWithPP/CMakeLists.txt index 8196b7acf38..a3f041f974e 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/CMakeLists.txt +++ b/ProcessLib/TwoPhaseFlowWithPP/CMakeLists.txt @@ -1,12 +1,10 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(TwoPhaseFlowWithPP ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS TwoPhaseFlowWithPP LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS TwoPhaseFlowWithPP + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -target_link_libraries(TwoPhaseFlowWithPP - PUBLIC ProcessLib - PRIVATE ParameterLib -) +target_link_libraries(TwoPhaseFlowWithPP PUBLIC ProcessLib PRIVATE ParameterLib) include(Tests.cmake) diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CMakeLists.txt b/ProcessLib/TwoPhaseFlowWithPrho/CMakeLists.txt index ed415c5f7dd..f1e93ca98b1 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/CMakeLists.txt +++ b/ProcessLib/TwoPhaseFlowWithPrho/CMakeLists.txt @@ -1,12 +1,12 @@ -APPEND_SOURCE_FILES(SOURCES) +append_source_files(SOURCES) add_library(TwoPhaseFlowWithPrho ${SOURCES}) if(BUILD_SHARED_LIBS) - install(TARGETS TwoPhaseFlowWithPrho LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(TARGETS TwoPhaseFlowWithPrho + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() target_link_libraries(TwoPhaseFlowWithPrho - PUBLIC ProcessLib - PRIVATE ParameterLib -) + PUBLIC ProcessLib + PRIVATE ParameterLib) include(Tests.cmake) -- GitLab