diff --git a/.cmake-format.py b/.cmake-format.py new file mode 100644 index 000000000..e79fe1ec4 --- /dev/null +++ b/.cmake-format.py @@ -0,0 +1,76 @@ +# -*- Python -*- + +with section("format"): + + # How wide to allow formatted cmake files + line_width = 100 + + # How many spaces to tab for indent + tab_size = 2 + + # If true, separate flow control names from their parentheses with a space + separate_ctrl_name_with_space = False + + # If true, separate function names from parentheses with a space + separate_fn_name_with_space = False + + # If a statement is wrapped to more than one line, then dangle the closing + # parenthesis on its own line. + dangle_parens = False + + # If a positional argument group contains more than this many arguments, then + # force it to a vertical layout. + max_pargs_hwrap = 3 + + # Force vertical alignment if command takes more than this number of lines + max_rows_cmdline = 1 + + # List of command names which should always be wrapped + always_wrap = ['configure_package_config_file', + 'list', + 'set_target_properties', + 'target_include_directories', + 'target_link_libraries', + 'FILES', + 'HEADERS', + 'INCLUDE_DIRECTORIES', + 'LINK_LIBRARIES', + 'NAMES', + 'PATHS', + 'PATH_SUFFIXES', + 'SOURCES' + ] + +with section("parse"): + + # Formatting for custom macros + additional_commands = { + "gridkit_add_library": { + "pargs": 1, # Number of initial positional arguments + "flags": [], + "kwargs": { + "SOURCES": "*", + "HEADERS": "*", + "LINK_LIBRARIES": "*", + "INCLUDE_DIRECTORIES": "*", + "COMPILE_OPTIONS": "*", + } + }, + "enzyme_build_object": { + "flags": [], + "kwargs": { + "NAME": 1, + "SOURCES": "*", + "LINK_LIBRARIES": "*", + "INCLUDE_DIRECTORIES": "*", + } + } + } + +with section("markup"): + + # Globally disable comment markup processing + enable_markup = False + + # Do not reflow the first comment block in each file + first_comment_is_literal = True diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7e72e746b..7dd757719 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,8 @@ repos: + - repo: https://github.com/cheshirekow/cmake-format-precommit + rev: v0.6.13 + hooks: + - id: cmake-format - repo: https://github.com/pre-commit/mirrors-clang-format rev: v19.1.7 hooks: diff --git a/CHANGELOG.md b/CHANGELOG.md index 51bec72ed..e3b957b79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ - Added node objects to `PowerElectronics` module & updated all examples to make use of them. - Separated internal and external residuals of `PowerElectronics` models. - Added `CliArgs` class for better management of command-line options. +- Added cmake-format hooks, including in pre-commit. ## v0.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 83201d58e..c7c29b5d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,14 +8,15 @@ cmake_minimum_required(VERSION 3.13) -project(GridKit - VERSION 0.1.0 - LANGUAGES CXX) +project( + GridKit + VERSION 0.1.0 + LANGUAGES CXX) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if (MSVC) +if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Wall") else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wconversion -Wpedantic") @@ -39,7 +40,14 @@ option(GridKit_ENABLE_ASAN "Enable the address sanitizer" OFF) option(GridKit_ENABLE_UBSAN "Enable the undefined behavior sanitizer" OFF) # This allows use of "GRIDKIT_*" versions of the above options -list(APPEND _gridkit_enable_options IPOPT SUNDIALS ENZYME ASAN UBSAN) +list( + APPEND + _gridkit_enable_options + IPOPT + SUNDIALS + ENZYME + ASAN + UBSAN) foreach(_opt IN LISTS _gridkit_enable_options) if(NOT DEFINED GRIDKIT_ENABLE_${_opt}) set(GRIDKIT_ENABLE_${_opt} ${GridKit_ENABLE_${_opt}}) @@ -48,19 +56,28 @@ endforeach() # Sanitizers if(GRIDKIT_ENABLE_ASAN) - set(GRIDKIT_COMPILE_OPTIONS ${GRIDKIT_COMPILE_OPTIONS} -fsanitize=address -fno-omit-frame-pointer CACHE INTERNAL STRING) - set(GRIDKIT_LINK_OPTIONS ${GRIDKIT_LINK_OPTIONS} -fsanitize=address CACHE INTERNAL STRING) + set(GRIDKIT_COMPILE_OPTIONS + ${GRIDKIT_COMPILE_OPTIONS} -fsanitize=address -fno-omit-frame-pointer + CACHE INTERNAL STRING) + set(GRIDKIT_LINK_OPTIONS + ${GRIDKIT_LINK_OPTIONS} -fsanitize=address + CACHE INTERNAL STRING) endif() if(GRIDKIT_ENABLE_UBSAN) - set(GRIDKIT_COMPILE_OPTIONS ${GRIDKIT_COMPILE_OPTIONS} -fsanitize=undefined -fno-omit-frame-pointer CACHE INTERNAL STRING) - set(GRIDKIT_LINK_OPTIONS ${GRIDKIT_LINK_OPTIONS} -fsanitize=undefined CACHE INTERNAL STRING) + set(GRIDKIT_COMPILE_OPTIONS + ${GRIDKIT_COMPILE_OPTIONS} -fsanitize=undefined -fno-omit-frame-pointer + CACHE INTERNAL STRING) + set(GRIDKIT_LINK_OPTIONS + ${GRIDKIT_LINK_OPTIONS} -fsanitize=undefined + CACHE INTERNAL STRING) endif() set(CMAKE_MACOSX_RPATH 1) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS 1) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +list( + APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#always-full-rpath # use, i.e. don't skip the full RPATH for the build tree @@ -77,9 +94,13 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # the RPATH to be used when installing, but only if it's not a system directory -list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) +list( + FIND + CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES + "${CMAKE_INSTALL_PREFIX}/lib" + isSystemDir) if("${isSystemDir}" STREQUAL "-1") - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") endif("${isSystemDir}" STREQUAL "-1") option(BUILD_SHARED_LIBS "Build shared libraries" ON) @@ -90,12 +111,19 @@ if(GRIDKIT_ENABLE_IPOPT) endif() if(GRIDKIT_ENABLE_SUNDIALS) enable_language(C) - find_package(SUNDIALS 7.4.0 REQUIRED CONFIG - PATHS ${SUNDIALS_DIR} - ${SUNDIALS_DIR}/lib/cmake/sundials) + find_package( + SUNDIALS + 7.4.0 + REQUIRED + CONFIG + PATHS + ${SUNDIALS_DIR} + ${SUNDIALS_DIR}/lib/cmake/sundials) message(STATUS "SUNDIALS configuration found: ${SUNDIALS_CONFIG}") if(TARGET SUNDIALS::sunlinsolklu) - set(GRIDKIT_ENABLE_SUNDIALS_SPARSE ON CACHE INTERNAL BOOL "Sparse solver enabled in SUNDIALS.") + set(GRIDKIT_ENABLE_SUNDIALS_SPARSE + ON + CACHE INTERNAL BOOL "Sparse solver enabled in SUNDIALS.") message(STATUS "KLU support enabled in SUNDIALS.") endif() endif() @@ -125,7 +153,8 @@ add_subdirectory(docs) export(EXPORT gridkit-targets FILE ${CMAKE_CURRENT_BINARY_DIR}/GridKitTargets.cmake) # Configuring exporting cmake config -install(EXPORT gridkit-targets +install( + EXPORT gridkit-targets FILE GridKitTargets.cmake NAMESPACE GridKit:: DESTINATION share/cmake/gridkit) @@ -133,19 +162,15 @@ install(EXPORT gridkit-targets include(CMakePackageConfigHelpers) # Basic version file -write_basic_package_version_file( - GridKitConfigVersion.cmake - COMPATIBILITY SameMajorVersion) +write_basic_package_version_file(GridKitConfigVersion.cmake COMPATIBILITY SameMajorVersion) # Generate config file that includes exports -configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/GridKitConfig.cmake +configure_package_config_file( + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/GridKitConfig.cmake INSTALL_DESTINATION share/cmake/gridkit - NO_SET_AND_CHECK_MACRO - NO_CHECK_REQUIRED_COMPONENTS_MACRO) + NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO) # Install configuration file -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/GridKitConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/GridKitConfigVersion.cmake - DESTINATION share/cmake/gridkit) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GridKitConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/GridKitConfigVersion.cmake + DESTINATION share/cmake/gridkit) diff --git a/GridKit/AutomaticDifferentiation/CMakeLists.txt b/GridKit/AutomaticDifferentiation/CMakeLists.txt index 1bf706028..f54431ca8 100644 --- a/GridKit/AutomaticDifferentiation/CMakeLists.txt +++ b/GridKit/AutomaticDifferentiation/CMakeLists.txt @@ -1,8 +1,3 @@ - -install( - FILES - DependencyTracking/Variable.hpp - DependencyTracking/VariableImplementation.hpp - DependencyTracking/VariableOperators.hpp - DESTINATION - include/GridKit/AutomaticDifferentiation/DependencyTracking) +install(FILES DependencyTracking/Variable.hpp DependencyTracking/VariableImplementation.hpp + DependencyTracking/VariableOperators.hpp + DESTINATION include/GridKit/AutomaticDifferentiation/DependencyTracking) diff --git a/GridKit/CMakeLists.txt b/GridKit/CMakeLists.txt index 83cca6579..f1ce7b5a4 100644 --- a/GridKit/CMakeLists.txt +++ b/GridKit/CMakeLists.txt @@ -1,12 +1,10 @@ -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/Definitions.hpp.in - ${CMAKE_CURRENT_BINARY_DIR}/Definitions.hpp) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Definitions.hpp - DESTINATION include/GridKit) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Definitions.hpp.in + ${CMAKE_CURRENT_BINARY_DIR}/Definitions.hpp) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Definitions.hpp DESTINATION include/GridKit) add_library(definitions INTERFACE) -target_include_directories(definitions INTERFACE - $ - $) +target_include_directories( + definitions + INTERFACE $ $) add_library(GridKit::definitions ALIAS definitions) install(TARGETS definitions EXPORT gridkit-targets) @@ -28,10 +26,4 @@ add_subdirectory(Solver) # Testing library add_subdirectory(Testing) -install( - FILES - Constants.hpp - CommonMath.hpp - ScalarTraits.hpp - DESTINATION - include/GridKit) +install(FILES Constants.hpp CommonMath.hpp ScalarTraits.hpp DESTINATION include/GridKit) diff --git a/GridKit/LinearAlgebra/CMakeLists.txt b/GridKit/LinearAlgebra/CMakeLists.txt index 3d324d485..4586c24e9 100644 --- a/GridKit/LinearAlgebra/CMakeLists.txt +++ b/GridKit/LinearAlgebra/CMakeLists.txt @@ -1,9 +1,4 @@ - add_subdirectory(SparseMatrix) add_subdirectory(DenseMatrix) -install( - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/MemoryUtils.hpp - DESTINATION - include/GridKit/LinearAlgebra) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/MemoryUtils.hpp DESTINATION include/GridKit/LinearAlgebra) diff --git a/GridKit/LinearAlgebra/DenseMatrix/CMakeLists.txt b/GridKit/LinearAlgebra/DenseMatrix/CMakeLists.txt index a51604026..5c292b728 100644 --- a/GridKit/LinearAlgebra/DenseMatrix/CMakeLists.txt +++ b/GridKit/LinearAlgebra/DenseMatrix/CMakeLists.txt @@ -1,11 +1,8 @@ - add_library(DenseMatrix INTERFACE) -target_include_directories(DenseMatrix INTERFACE ${CMAKE_SOURCE_DIR}) +target_include_directories( + DenseMatrix + INTERFACE ${CMAKE_SOURCE_DIR}) add_library(GridKit::DenseMatrix ALIAS DenseMatrix) -install( - FILES - DenseMatrix.hpp - DESTINATION - include/GridKit/LinearAlgebra/DenseMatrix) +install(FILES DenseMatrix.hpp DESTINATION include/GridKit/LinearAlgebra/DenseMatrix) diff --git a/GridKit/LinearAlgebra/SparseMatrix/CMakeLists.txt b/GridKit/LinearAlgebra/SparseMatrix/CMakeLists.txt index 3dc4bd274..443baa6fb 100644 --- a/GridKit/LinearAlgebra/SparseMatrix/CMakeLists.txt +++ b/GridKit/LinearAlgebra/SparseMatrix/CMakeLists.txt @@ -1,8 +1,4 @@ -gridkit_add_library(sparse_matrix - SOURCES - CooMatrix.cpp - CsrMatrix.cpp - HEADERS - COO_Matrix.hpp - CooMatrix.hpp - CsrMatrix.hpp) +gridkit_add_library( + sparse_matrix + SOURCES CooMatrix.cpp CsrMatrix.cpp + HEADERS COO_Matrix.hpp CooMatrix.hpp CsrMatrix.hpp) diff --git a/GridKit/Model/CMakeLists.txt b/GridKit/Model/CMakeLists.txt index 74a0910aa..af94b489f 100644 --- a/GridKit/Model/CMakeLists.txt +++ b/GridKit/Model/CMakeLists.txt @@ -9,8 +9,5 @@ add_subdirectory(PhasorDynamics) add_subdirectory(PowerFlow) add_subdirectory(PowerElectronics) -install(FILES - Evaluator.hpp - VariableMonitor.hpp - VariableMonitorController.hpp - DESTINATION include/GridKit/Model) +install(FILES Evaluator.hpp VariableMonitor.hpp VariableMonitorController.hpp + DESTINATION include/GridKit/Model) diff --git a/GridKit/Model/PhasorDynamics/Branch/CMakeLists.txt b/GridKit/Model/PhasorDynamics/Branch/CMakeLists.txt index 3325ea604..a591db47d 100644 --- a/GridKit/Model/PhasorDynamics/Branch/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/Branch/CMakeLists.txt @@ -1,49 +1,46 @@ - # [[ # Author(s): # - Cameron Rutherford # - Slaven Peles # ]] -set(_install_headers - Branch.hpp - BranchData.hpp) +set(_install_headers Branch.hpp BranchData.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_branch - SOURCES - BranchEnzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_branch + SOURCES BranchEnzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PRIVATE ClangEnzymeFlags - PUBLIC GridKit::phasor_dynamics_core + PRIVATE + ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno) else() - gridkit_add_library(phasor_dynamics_branch - SOURCES - Branch.cpp - HEADERS - ${_install_headers} - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) + gridkit_add_library( + phasor_dynamics_branch + SOURCES Branch.cpp + HEADERS ${_install_headers} + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) endif() -gridkit_add_library(phasor_dynamics_branch_dependency_tracking - SOURCES - BranchDependencyTracking.cpp - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) +gridkit_add_library( + phasor_dynamics_branch_dependency_tracking + SOURCES BranchDependencyTracking.cpp + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_branch) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_branch_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/Bus/CMakeLists.txt b/GridKit/Model/PhasorDynamics/Bus/CMakeLists.txt index ca318a3b5..7f69b6ff4 100644 --- a/GridKit/Model/PhasorDynamics/Bus/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/Bus/CMakeLists.txt @@ -5,46 +5,37 @@ #]] set(_install_headers - Bus.hpp - BusData.hpp - BusFactory.hpp - BusInfinite.hpp) + Bus.hpp + BusData.hpp + BusFactory.hpp + BusInfinite.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_bus - SOURCES - BusEnzyme.cpp - BusInfinite.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core) + gridkit_add_library( + phasor_dynamics_bus + SOURCES BusEnzyme.cpp BusInfinite.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core) else() - gridkit_add_library(phasor_dynamics_bus - SOURCES - Bus.cpp - BusInfinite.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core) + gridkit_add_library( + phasor_dynamics_bus + SOURCES Bus.cpp BusInfinite.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core) endif() -gridkit_add_library(phasor_dynamics_bus_dependency_tracking - SOURCES - BusDependencyTracking.cpp - BusInfiniteDependencyTracking.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core) +gridkit_add_library( + phasor_dynamics_bus_dependency_tracking + SOURCES BusDependencyTracking.cpp BusInfiniteDependencyTracking.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_bus) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_bus_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/BusFault/CMakeLists.txt b/GridKit/Model/PhasorDynamics/BusFault/CMakeLists.txt index 53b0de987..f5ef9189b 100644 --- a/GridKit/Model/PhasorDynamics/BusFault/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/BusFault/CMakeLists.txt @@ -1,43 +1,40 @@ - -set(_install_headers - BusFault.hpp - BusFaultData.hpp) +set(_install_headers BusFault.hpp BusFaultData.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_bus_fault - SOURCES - BusFaultEnzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_bus_fault + SOURCES BusFaultEnzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PRIVATE ClangEnzymeFlags - PUBLIC GridKit::phasor_dynamics_core + PRIVATE + ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno) else() - gridkit_add_library(phasor_dynamics_bus_fault - SOURCES - BusFault.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core) + gridkit_add_library( + phasor_dynamics_bus_fault + SOURCES BusFault.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core) endif() -gridkit_add_library(phasor_dynamics_bus_fault_dependency_tracking - SOURCES - BusFaultDependencyTracking.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core) +gridkit_add_library( + phasor_dynamics_bus_fault_dependency_tracking + SOURCES BusFaultDependencyTracking.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_bus_fault) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_bus_fault_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/CMakeLists.txt b/GridKit/Model/PhasorDynamics/CMakeLists.txt index b586b2fd7..9bd5d4a7f 100644 --- a/GridKit/Model/PhasorDynamics/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/CMakeLists.txt @@ -6,30 +6,36 @@ add_library(phasor_dynamics_components INTERFACE) add_library(phasor_dynamics_components_dependency_tracking INTERFACE) -gridkit_add_library(phasor_dynamics_core - SOURCES - SystemModelData.cpp - HEADERS - BusBase.hpp - BusBaseImpl.hpp - Component.hpp - ComponentData.hpp - ComponentLibrary.hpp - ComponentSignals.hpp - GridElement.hpp - SystemModel.hpp - SystemModelData.hpp +gridkit_add_library( + phasor_dynamics_core + SOURCES SystemModelData.cpp + HEADERS BusBase.hpp + BusBaseImpl.hpp + Component.hpp + ComponentData.hpp + ComponentLibrary.hpp + ComponentSignals.hpp + GridElement.hpp + SystemModel.hpp + SystemModelData.hpp LINK_LIBRARIES - PUBLIC GridKit::definitions - PUBLIC GridKit::utilities_logger - PUBLIC GridKit::sparse_matrix + PUBLIC + GridKit::definitions + PUBLIC + GridKit::utilities_logger + PUBLIC + GridKit::sparse_matrix INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/nlohmann-json/include - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) + PRIVATE + ${GRIDKIT_THIRD_PARTY_DIR}/nlohmann-json/include + PRIVATE + ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_core) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_core) add_subdirectory(Branch) @@ -44,12 +50,9 @@ add_subdirectory(SynchronousMachine) add_subdirectory(SignalNode) -add_library(GridKit::phasor_dynamics_components - ALIAS phasor_dynamics_components) -add_library(GridKit::phasor_dynamics_components_dependency_tracking - ALIAS phasor_dynamics_components_dependency_tracking) +add_library(GridKit::phasor_dynamics_components ALIAS phasor_dynamics_components) +add_library(GridKit::phasor_dynamics_components_dependency_tracking ALIAS + phasor_dynamics_components_dependency_tracking) -install(TARGETS - phasor_dynamics_components - phasor_dynamics_components_dependency_tracking - EXPORT gridkit-targets) +install(TARGETS phasor_dynamics_components phasor_dynamics_components_dependency_tracking + EXPORT gridkit-targets) diff --git a/GridKit/Model/PhasorDynamics/Exciter/IEEET1/CMakeLists.txt b/GridKit/Model/PhasorDynamics/Exciter/IEEET1/CMakeLists.txt index 52d50ded9..d46366b82 100644 --- a/GridKit/Model/PhasorDynamics/Exciter/IEEET1/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/Exciter/IEEET1/CMakeLists.txt @@ -4,48 +4,45 @@ # - Adam Birchfield # ]] -set(_install_headers - Ieeet1.hpp - Ieeet1Data.hpp) +set(_install_headers Ieeet1.hpp Ieeet1Data.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_exciter_ieeet1 - SOURCES - Ieeet1Enzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_exciter_ieeet1 + SOURCES Ieeet1Enzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal - PRIVATE ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal + PRIVATE + ClangEnzymeFlags COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno) else() - gridkit_add_library(phasor_dynamics_exciter_ieeet1 - SOURCES - Ieeet1.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - GridKit::phasor_dynamics_core - GridKit::phasor_dynamics_signal) + gridkit_add_library( + phasor_dynamics_exciter_ieeet1 + SOURCES Ieeet1.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES GridKit::phasor_dynamics_core GridKit::phasor_dynamics_signal) endif() -gridkit_add_library(phasor_dynamics_exciter_ieeet1_dependency_tracking - SOURCES - Ieeet1DependencyTracking.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - GridKit::phasor_dynamics_core - GridKit::phasor_dynamics_signal_dependency_tracking) +gridkit_add_library( + phasor_dynamics_exciter_ieeet1_dependency_tracking + SOURCES Ieeet1DependencyTracking.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES GridKit::phasor_dynamics_core GridKit::phasor_dynamics_signal_dependency_tracking) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_exciter_ieeet1) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_exciter_ieeet1_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/Exciter/SEXS-PTI/CMakeLists.txt b/GridKit/Model/PhasorDynamics/Exciter/SEXS-PTI/CMakeLists.txt index ed45b54b7..a04bcd7db 100644 --- a/GridKit/Model/PhasorDynamics/Exciter/SEXS-PTI/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/Exciter/SEXS-PTI/CMakeLists.txt @@ -3,47 +3,44 @@ # - Luke Lowery # ]] -set(_install_headers - SexsPti.hpp - SexsPtiData.hpp) +set(_install_headers SexsPti.hpp SexsPtiData.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_exciter_sexspti - SOURCES - SexsPtiEnzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_exciter_sexspti + SOURCES SexsPtiEnzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal - PRIVATE ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal + PRIVATE + ClangEnzymeFlags COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno) else() - gridkit_add_library(phasor_dynamics_exciter_sexspti - SOURCES - SexsPti.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - GridKit::phasor_dynamics_core - GridKit::phasor_dynamics_signal) + gridkit_add_library( + phasor_dynamics_exciter_sexspti + SOURCES SexsPti.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES GridKit::phasor_dynamics_core GridKit::phasor_dynamics_signal) endif() -gridkit_add_library(phasor_dynamics_exciter_sexspti_dependency_tracking - SOURCES - SexsPtiDependencyTracking.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - GridKit::phasor_dynamics_core - GridKit::phasor_dynamics_signal_dependency_tracking) +gridkit_add_library( + phasor_dynamics_exciter_sexspti_dependency_tracking + SOURCES SexsPtiDependencyTracking.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES GridKit::phasor_dynamics_core GridKit::phasor_dynamics_signal_dependency_tracking) -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_exciter_sexspti) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_exciter_sexspti_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/Governor/CMakeLists.txt b/GridKit/Model/PhasorDynamics/Governor/CMakeLists.txt index 27296107a..7c7269784 100644 --- a/GridKit/Model/PhasorDynamics/Governor/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/Governor/CMakeLists.txt @@ -1,4 +1,3 @@ - # [[ # Author(s): # - Luke Lowery diff --git a/GridKit/Model/PhasorDynamics/Governor/Tgov1/CMakeLists.txt b/GridKit/Model/PhasorDynamics/Governor/Tgov1/CMakeLists.txt index 4bc718109..d4647a826 100644 --- a/GridKit/Model/PhasorDynamics/Governor/Tgov1/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/Governor/Tgov1/CMakeLists.txt @@ -4,42 +4,46 @@ # - Adam Birchfield # ]] -set(_install_headers - Tgov1.hpp - Tgov1Data.hpp) +set(_install_headers Tgov1.hpp Tgov1Data.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_governor_tgov1 - SOURCES - Tgov1Enzyme.cpp - HEADERS - ${_install_headers} + gridkit_add_library( + phasor_dynamics_governor_tgov1 + SOURCES Tgov1Enzyme.cpp + HEADERS ${_install_headers} LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal - PRIVATE ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal + PRIVATE + ClangEnzymeFlags COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno) else() - gridkit_add_library(phasor_dynamics_governor_tgov1 - SOURCES - Tgov1.cpp - HEADERS - ${_install_headers} - LINK_LIBRARIES - GridKit::phasor_dynamics_core - GridKit::phasor_dynamics_signal) + gridkit_add_library( + phasor_dynamics_governor_tgov1 + SOURCES Tgov1.cpp + HEADERS ${_install_headers} + LINK_LIBRARIES GridKit::phasor_dynamics_core GridKit::phasor_dynamics_signal) endif() -gridkit_add_library(phasor_dynamics_governor_tgov1_dependency_tracking - SOURCES - Tgov1DependencyTracking.cpp +gridkit_add_library( + phasor_dynamics_governor_tgov1_dependency_tracking + SOURCES Tgov1DependencyTracking.cpp LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal_dependency_tracking) + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal_dependency_tracking) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_governor_tgov1) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_governor_tgov1_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/Load/CMakeLists.txt b/GridKit/Model/PhasorDynamics/Load/CMakeLists.txt index 91fb51641..64e432a8a 100644 --- a/GridKit/Model/PhasorDynamics/Load/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/Load/CMakeLists.txt @@ -1,49 +1,45 @@ - - # [[ # Author(s): # - Cameron Rutherford # ]] -set(_install_headers - Load.hpp - LoadData.hpp) +set(_install_headers Load.hpp LoadData.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_load - SOURCES - LoadEnzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_load + SOURCES LoadEnzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PRIVATE ClangEnzymeFlags - PUBLIC GridKit::phasor_dynamics_core + PRIVATE + ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno) else() - gridkit_add_library(phasor_dynamics_load - SOURCES - Load.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - HEADERS - ${_install_headers}) + gridkit_add_library( + phasor_dynamics_load + SOURCES Load.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core + HEADERS ${_install_headers}) endif() -gridkit_add_library(phasor_dynamics_load_dependency_tracking - SOURCES - LoadDependencyTracking.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core) +gridkit_add_library( + phasor_dynamics_load_dependency_tracking + SOURCES LoadDependencyTracking.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_load) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_load_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/LoadZIP/CMakeLists.txt b/GridKit/Model/PhasorDynamics/LoadZIP/CMakeLists.txt index c095d3923..751fbba9a 100644 --- a/GridKit/Model/PhasorDynamics/LoadZIP/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/LoadZIP/CMakeLists.txt @@ -1,43 +1,40 @@ - -set(_install_headers - LoadZIP.hpp - LoadZIPData.hpp) +set(_install_headers LoadZIP.hpp LoadZIPData.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_loadzip - SOURCES - LoadZIPEnzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_loadzip + SOURCES LoadZIPEnzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PRIVATE ClangEnzymeFlags - PUBLIC GridKit::phasor_dynamics_core + PRIVATE + ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno) else() - gridkit_add_library(phasor_dynamics_loadzip - SOURCES - LoadZIP.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - HEADERS - ${_install_headers}) + gridkit_add_library( + phasor_dynamics_loadzip + SOURCES LoadZIP.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core + HEADERS ${_install_headers}) endif() -gridkit_add_library(phasor_dynamics_loadzip_dependency_tracking - SOURCES - LoadZIPDependencyTracking.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core) +gridkit_add_library( + phasor_dynamics_loadzip_dependency_tracking + SOURCES LoadZIPDependencyTracking.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_loadzip) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_loadzip_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/SignalNode/CMakeLists.txt b/GridKit/Model/PhasorDynamics/SignalNode/CMakeLists.txt index 53746807e..7b9d3baa7 100644 --- a/GridKit/Model/PhasorDynamics/SignalNode/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/SignalNode/CMakeLists.txt @@ -1,22 +1,21 @@ - # [[ # Author(s): # - Cameron Rutherford # - Slaven Peles # ]] -gridkit_add_library(phasor_dynamics_signal - SOURCES - SignalNode.cpp - HEADERS - SignalNode.hpp - SignalNodeData.hpp) +gridkit_add_library( + phasor_dynamics_signal + SOURCES SignalNode.cpp + HEADERS SignalNode.hpp SignalNodeData.hpp) gridkit_add_library(phasor_dynamics_signal_dependency_tracking - SOURCES SignalNodeDependencyTracking.cpp) + SOURCES SignalNodeDependencyTracking.cpp) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_signal) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_signal_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/Stabilizer/IEEEST/CMakeLists.txt b/GridKit/Model/PhasorDynamics/Stabilizer/IEEEST/CMakeLists.txt index 6fb7da2fa..936a29ea1 100644 --- a/GridKit/Model/PhasorDynamics/Stabilizer/IEEEST/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/Stabilizer/IEEEST/CMakeLists.txt @@ -3,48 +3,53 @@ # - Luke Lowery # ]] -set(_install_headers - Ieeest.hpp - IeeestData.hpp) +set(_install_headers Ieeest.hpp IeeestData.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_stabilizer_ieeest - SOURCES - IeeestEnzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_stabilizer_ieeest + SOURCES IeeestEnzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal - PRIVATE ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal + PRIVATE + ClangEnzymeFlags COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno) else() - gridkit_add_library(phasor_dynamics_stabilizer_ieeest - SOURCES - Ieeest.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_stabilizer_ieeest + SOURCES Ieeest.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal) + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal) endif() -gridkit_add_library(phasor_dynamics_stabilizer_ieeest_dependency_tracking - SOURCES - IeeestDependencyTracking.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include +gridkit_add_library( + phasor_dynamics_stabilizer_ieeest_dependency_tracking + SOURCES IeeestDependencyTracking.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal_dependency_tracking) + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal_dependency_tracking) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_stabilizer_ieeest) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_stabilizer_ieeest_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/SynchronousMachine/CMakeLists.txt b/GridKit/Model/PhasorDynamics/SynchronousMachine/CMakeLists.txt index 331c656b1..b2cec9310 100644 --- a/GridKit/Model/PhasorDynamics/SynchronousMachine/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/SynchronousMachine/CMakeLists.txt @@ -1,4 +1,3 @@ - # [[ # Author(s): # - Cameron Rutherford diff --git a/GridKit/Model/PhasorDynamics/SynchronousMachine/GENROUwS/CMakeLists.txt b/GridKit/Model/PhasorDynamics/SynchronousMachine/GENROUwS/CMakeLists.txt index eda3242f6..618fb3156 100644 --- a/GridKit/Model/PhasorDynamics/SynchronousMachine/GENROUwS/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/SynchronousMachine/GENROUwS/CMakeLists.txt @@ -1,46 +1,51 @@ - -set(_install_headers - Genrou.hpp - GenrouData.hpp) +set(_install_headers Genrou.hpp GenrouData.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_genrou - SOURCES - GenrouEnzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_genrou + SOURCES GenrouEnzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal - PRIVATE ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal + PRIVATE + ClangEnzymeFlags COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno -fno-vectorize) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno + -fno-vectorize) else() - gridkit_add_library(phasor_dynamics_genrou - SOURCES - Genrou.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_genrou + SOURCES Genrou.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal) + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal) endif() -gridkit_add_library(phasor_dynamics_genrou_dependency_tracking - SOURCES - GenrouDependencyTracking.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include +gridkit_add_library( + phasor_dynamics_genrou_dependency_tracking + SOURCES GenrouDependencyTracking.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal_dependency_tracking) + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal_dependency_tracking) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_genrou) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_genrou_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/SynchronousMachine/GENSALwS/CMakeLists.txt b/GridKit/Model/PhasorDynamics/SynchronousMachine/GENSALwS/CMakeLists.txt index c4f14f07e..97cf36f43 100644 --- a/GridKit/Model/PhasorDynamics/SynchronousMachine/GENSALwS/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/SynchronousMachine/GENSALwS/CMakeLists.txt @@ -1,45 +1,51 @@ -set(_install_headers - Gensal.hpp - GensalData.hpp) +set(_install_headers Gensal.hpp GensalData.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_gensal - SOURCES - GensalEnzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_gensal + SOURCES GensalEnzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal - PRIVATE ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal + PRIVATE + ClangEnzymeFlags COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno -fno-vectorize) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno + -fno-vectorize) else() - gridkit_add_library(phasor_dynamics_gensal - SOURCES - Gensal.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_gensal + SOURCES Gensal.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal) + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal) endif() -gridkit_add_library(phasor_dynamics_gensal_dependency_tracking - SOURCES - GensalDependencyTracking.cpp - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include +gridkit_add_library( + phasor_dynamics_gensal_dependency_tracking + SOURCES GensalDependencyTracking.cpp + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - PUBLIC GridKit::phasor_dynamics_signal_dependency_tracking) + PUBLIC + GridKit::phasor_dynamics_core + PUBLIC + GridKit::phasor_dynamics_signal_dependency_tracking) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_gensal) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_gensal_dependency_tracking) diff --git a/GridKit/Model/PhasorDynamics/SynchronousMachine/GenClassical/CMakeLists.txt b/GridKit/Model/PhasorDynamics/SynchronousMachine/GenClassical/CMakeLists.txt index ef03af11a..faba69e89 100644 --- a/GridKit/Model/PhasorDynamics/SynchronousMachine/GenClassical/CMakeLists.txt +++ b/GridKit/Model/PhasorDynamics/SynchronousMachine/GenClassical/CMakeLists.txt @@ -4,45 +4,43 @@ # - Slaven Peles # ]] -set(_install_headers - GenClassical.hpp - GenClassicalData.hpp) +set(_install_headers GenClassical.hpp GenClassicalData.hpp) if(GRIDKIT_ENABLE_ENZYME) - gridkit_add_library(phasor_dynamics_gen_classical - SOURCES - GenClassicalEnzyme.cpp - HEADERS - ${_install_headers} - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include + gridkit_add_library( + phasor_dynamics_gen_classical + SOURCES GenClassicalEnzyme.cpp + HEADERS ${_install_headers} + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include LINK_LIBRARIES - PRIVATE ClangEnzymeFlags - PUBLIC GridKit::phasor_dynamics_core + PRIVATE + ClangEnzymeFlags + PUBLIC + GridKit::phasor_dynamics_core COMPILE_OPTIONS - PRIVATE -mllvm -enzyme-auto-sparsity=1 -fno-math-errno) + PRIVATE + -mllvm + -enzyme-auto-sparsity=1 + -fno-math-errno) else() - gridkit_add_library(phasor_dynamics_gen_classical - SOURCES - GenClassical.cpp - HEADERS - ${_install_headers} - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) + gridkit_add_library( + phasor_dynamics_gen_classical + SOURCES GenClassical.cpp + HEADERS ${_install_headers} + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) endif() -gridkit_add_library(phasor_dynamics_gen_classical_dependency_tracking - SOURCES - GenClassicalDependencyTracking.cpp - LINK_LIBRARIES - PUBLIC GridKit::phasor_dynamics_core - INCLUDE_DIRECTORIES - PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) +gridkit_add_library( + phasor_dynamics_gen_classical_dependency_tracking + SOURCES GenClassicalDependencyTracking.cpp + LINK_LIBRARIES PUBLIC GridKit::phasor_dynamics_core + INCLUDE_DIRECTORIES PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) # Link to interface target for all components -target_link_libraries(phasor_dynamics_components +target_link_libraries( + phasor_dynamics_components INTERFACE GridKit::phasor_dynamics_gen_classical) -target_link_libraries(phasor_dynamics_components_dependency_tracking +target_link_libraries( + phasor_dynamics_components_dependency_tracking INTERFACE GridKit::phasor_dynamics_gen_classical_dependency_tracking) diff --git a/GridKit/Model/PowerElectronics/Bus/CMakeLists.txt b/GridKit/Model/PowerElectronics/Bus/CMakeLists.txt index c877818eb..bff7495d9 100644 --- a/GridKit/Model/PowerElectronics/Bus/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/Bus/CMakeLists.txt @@ -1,8 +1,6 @@ install( - FILES - Bus.hpp - SignalNode.hpp - GroundedBus.hpp - MicrogridBus.hpp - DESTINATION - include/GridKit/Model/PowerElectronics/Bus) + FILES Bus.hpp + SignalNode.hpp + GroundedBus.hpp + MicrogridBus.hpp + DESTINATION include/GridKit/Model/PowerElectronics/Bus) diff --git a/GridKit/Model/PowerElectronics/CMakeLists.txt b/GridKit/Model/PowerElectronics/CMakeLists.txt index 95fdc499f..fee2e752f 100644 --- a/GridKit/Model/PowerElectronics/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/CMakeLists.txt @@ -1,12 +1,9 @@ - add_library(power_electronics_circuit_node INTERFACE) -target_include_directories(power_electronics_circuit_node - INTERFACE - $ - $) +target_include_directories( + power_electronics_circuit_node + INTERFACE $ $) -add_library(GridKit::power_electronics_circuit_node - ALIAS power_electronics_circuit_node) +add_library(GridKit::power_electronics_circuit_node ALIAS power_electronics_circuit_node) add_subdirectory(Bus) add_subdirectory(Capacitor) @@ -23,11 +20,9 @@ add_subdirectory(MicrogridLine) add_subdirectory(MicrogridBusDQ) install( - FILES - CircuitComponent.hpp - CircuitNode.hpp - CircuitGraph.hpp - SystemModelPowerElectronics.hpp - NodeBase.hpp - DESTINATION - include/GridKit/Model/PowerElectronics) + FILES CircuitComponent.hpp + CircuitNode.hpp + CircuitGraph.hpp + SystemModelPowerElectronics.hpp + NodeBase.hpp + DESTINATION include/GridKit/Model/PowerElectronics) diff --git a/GridKit/Model/PowerElectronics/Capacitor/CMakeLists.txt b/GridKit/Model/PowerElectronics/Capacitor/CMakeLists.txt index 02b2559ac..49aad14b6 100644 --- a/GridKit/Model/PowerElectronics/Capacitor/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/Capacitor/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_capacitor - SOURCES - Capacitor.cpp - HEADERS - Capacitor.hpp) +gridkit_add_library( + power_elec_capacitor + SOURCES Capacitor.cpp + HEADERS Capacitor.hpp) diff --git a/GridKit/Model/PowerElectronics/DistributedGenerator/CMakeLists.txt b/GridKit/Model/PowerElectronics/DistributedGenerator/CMakeLists.txt index 02f157a9d..8443f1c62 100644 --- a/GridKit/Model/PowerElectronics/DistributedGenerator/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/DistributedGenerator/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_disgen - SOURCES - DistributedGenerator.cpp - HEADERS - DistributedGenerator.hpp) +gridkit_add_library( + power_elec_disgen + SOURCES DistributedGenerator.cpp + HEADERS DistributedGenerator.hpp) diff --git a/GridKit/Model/PowerElectronics/InductionMotor/CMakeLists.txt b/GridKit/Model/PowerElectronics/InductionMotor/CMakeLists.txt index 05fb8b850..46e2f645c 100644 --- a/GridKit/Model/PowerElectronics/InductionMotor/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/InductionMotor/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_inductionmotor - SOURCES - InductionMotor.cpp - HEADERS - InductionMotor.hpp) +gridkit_add_library( + power_elec_inductionmotor + SOURCES InductionMotor.cpp + HEADERS InductionMotor.hpp) diff --git a/GridKit/Model/PowerElectronics/Inductor/CMakeLists.txt b/GridKit/Model/PowerElectronics/Inductor/CMakeLists.txt index fbb7e091a..8bb22f467 100644 --- a/GridKit/Model/PowerElectronics/Inductor/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/Inductor/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_inductor - SOURCES - Inductor.cpp - HEADERS - Inductor.hpp) +gridkit_add_library( + power_elec_inductor + SOURCES Inductor.cpp + HEADERS Inductor.hpp) diff --git a/GridKit/Model/PowerElectronics/LinearTransformer/CMakeLists.txt b/GridKit/Model/PowerElectronics/LinearTransformer/CMakeLists.txt index c1de725b5..0c2c9b7f7 100644 --- a/GridKit/Model/PowerElectronics/LinearTransformer/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/LinearTransformer/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_lineartrasnformer - SOURCES - LinearTransformer.cpp - HEADERS - LinearTransformer.hpp) +gridkit_add_library( + power_elec_lineartrasnformer + SOURCES LinearTransformer.cpp + HEADERS LinearTransformer.hpp) diff --git a/GridKit/Model/PowerElectronics/MicrogridBusDQ/CMakeLists.txt b/GridKit/Model/PowerElectronics/MicrogridBusDQ/CMakeLists.txt index eae24a871..2cb3c90e4 100644 --- a/GridKit/Model/PowerElectronics/MicrogridBusDQ/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/MicrogridBusDQ/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_microbusdq - SOURCES - MicrogridBusDQ.cpp - HEADERS - MicrogridBusDQ.hpp) +gridkit_add_library( + power_elec_microbusdq + SOURCES MicrogridBusDQ.cpp + HEADERS MicrogridBusDQ.hpp) diff --git a/GridKit/Model/PowerElectronics/MicrogridLine/CMakeLists.txt b/GridKit/Model/PowerElectronics/MicrogridLine/CMakeLists.txt index 0135cf144..d5d0b6bee 100644 --- a/GridKit/Model/PowerElectronics/MicrogridLine/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/MicrogridLine/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_microline - SOURCES - MicrogridLine.cpp - HEADERS - MicrogridLine.hpp) +gridkit_add_library( + power_elec_microline + SOURCES MicrogridLine.cpp + HEADERS MicrogridLine.hpp) diff --git a/GridKit/Model/PowerElectronics/MicrogridLoad/CMakeLists.txt b/GridKit/Model/PowerElectronics/MicrogridLoad/CMakeLists.txt index 8b966e5a0..bf45b8ede 100644 --- a/GridKit/Model/PowerElectronics/MicrogridLoad/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/MicrogridLoad/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_microload - SOURCES - MicrogridLoad.cpp - HEADERS - MicrogridLoad.hpp) +gridkit_add_library( + power_elec_microload + SOURCES MicrogridLoad.cpp + HEADERS MicrogridLoad.hpp) diff --git a/GridKit/Model/PowerElectronics/Resistor/CMakeLists.txt b/GridKit/Model/PowerElectronics/Resistor/CMakeLists.txt index 894f1acd3..aa3c25a80 100644 --- a/GridKit/Model/PowerElectronics/Resistor/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/Resistor/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_resistor - SOURCES - Resistor.cpp - HEADERS - Resistor.hpp) +gridkit_add_library( + power_elec_resistor + SOURCES Resistor.cpp + HEADERS Resistor.hpp) diff --git a/GridKit/Model/PowerElectronics/SynchronousMachine/CMakeLists.txt b/GridKit/Model/PowerElectronics/SynchronousMachine/CMakeLists.txt index 7f67b9b6f..9a7b81528 100644 --- a/GridKit/Model/PowerElectronics/SynchronousMachine/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/SynchronousMachine/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_synmachine - SOURCES - SynchronousMachine.cpp - HEADERS - SynchronousMachine.hpp) +gridkit_add_library( + power_elec_synmachine + SOURCES SynchronousMachine.cpp + HEADERS SynchronousMachine.hpp) diff --git a/GridKit/Model/PowerElectronics/TransmissionLine/CMakeLists.txt b/GridKit/Model/PowerElectronics/TransmissionLine/CMakeLists.txt index b4e40f8f4..d24e46a27 100644 --- a/GridKit/Model/PowerElectronics/TransmissionLine/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/TransmissionLine/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_tranline - SOURCES - TransmissionLine.cpp - HEADERS - TransmissionLine.hpp) +gridkit_add_library( + power_elec_tranline + SOURCES TransmissionLine.cpp + HEADERS TransmissionLine.hpp) diff --git a/GridKit/Model/PowerElectronics/VoltageSource/CMakeLists.txt b/GridKit/Model/PowerElectronics/VoltageSource/CMakeLists.txt index c1ab8eac7..cb1e2ed81 100644 --- a/GridKit/Model/PowerElectronics/VoltageSource/CMakeLists.txt +++ b/GridKit/Model/PowerElectronics/VoltageSource/CMakeLists.txt @@ -1,5 +1,4 @@ -gridkit_add_library(power_elec_voltagesource - SOURCES - VoltageSource.cpp - HEADERS - VoltageSource.hpp) +gridkit_add_library( + power_elec_voltagesource + SOURCES VoltageSource.cpp + HEADERS VoltageSource.hpp) diff --git a/GridKit/Model/PowerFlow/Branch/CMakeLists.txt b/GridKit/Model/PowerFlow/Branch/CMakeLists.txt index fcf4380fc..ed0e7baf7 100644 --- a/GridKit/Model/PowerFlow/Branch/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/Branch/CMakeLists.txt @@ -3,8 +3,7 @@ # - Cameron Rutherford #]] -gridkit_add_library(branch - SOURCES - Branch.cpp - HEADERS - Branch.hpp) +gridkit_add_library( + branch + SOURCES Branch.cpp + HEADERS Branch.hpp) diff --git a/GridKit/Model/PowerFlow/Bus/CMakeLists.txt b/GridKit/Model/PowerFlow/Bus/CMakeLists.txt index 86945c93a..f06511289 100644 --- a/GridKit/Model/PowerFlow/Bus/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/Bus/CMakeLists.txt @@ -5,14 +5,11 @@ # - Cameron Rutherford #]] -gridkit_add_library(bus - SOURCES - BusPQ.cpp - BusPV.cpp - BusSlack.cpp - HEADERS - BaseBus.hpp - BusFactory.hpp - BusPQ.hpp - BusPV.hpp - BusSlack.hpp) +gridkit_add_library( + bus + SOURCES BusPQ.cpp BusPV.cpp BusSlack.cpp + HEADERS BaseBus.hpp + BusFactory.hpp + BusPQ.hpp + BusPV.hpp + BusSlack.hpp) diff --git a/GridKit/Model/PowerFlow/CMakeLists.txt b/GridKit/Model/PowerFlow/CMakeLists.txt index 407190f37..96c07eb67 100644 --- a/GridKit/Model/PowerFlow/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/CMakeLists.txt @@ -14,10 +14,8 @@ add_subdirectory(Load) add_subdirectory(MiniGrid) install( - FILES - MatpowerParser.hpp - PowerFlowData.hpp - SystemModel.hpp - SystemModelPowerFlow.hpp - DESTINATION - include/GridKit/Model/PowerFlow) + FILES MatpowerParser.hpp + PowerFlowData.hpp + SystemModel.hpp + SystemModelPowerFlow.hpp + DESTINATION include/GridKit/Model/PowerFlow) diff --git a/GridKit/Model/PowerFlow/Generator/CMakeLists.txt b/GridKit/Model/PowerFlow/Generator/CMakeLists.txt index 5a1053ed7..1136651f2 100644 --- a/GridKit/Model/PowerFlow/Generator/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/Generator/CMakeLists.txt @@ -3,14 +3,11 @@ # - Cameron Rutherford #]] -gridkit_add_library(generator - SOURCES - GeneratorSlack.cpp - GeneratorPV.cpp - GeneratorPQ.cpp - HEADERS - GeneratorBase.hpp - GeneratorFactory.hpp - GeneratorPQ.hpp - GeneratorPV.hpp - GeneratorSlack.hpp) +gridkit_add_library( + generator + SOURCES GeneratorSlack.cpp GeneratorPV.cpp GeneratorPQ.cpp + HEADERS GeneratorBase.hpp + GeneratorFactory.hpp + GeneratorPQ.hpp + GeneratorPV.hpp + GeneratorSlack.hpp) diff --git a/GridKit/Model/PowerFlow/Generator2/CMakeLists.txt b/GridKit/Model/PowerFlow/Generator2/CMakeLists.txt index 207e46091..0c64cc1a7 100644 --- a/GridKit/Model/PowerFlow/Generator2/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/Generator2/CMakeLists.txt @@ -3,8 +3,7 @@ # - Cameron Rutherford #]] -gridkit_add_library(generator2 - SOURCES - Generator2.cpp - HEADERS - Generator2.hpp) +gridkit_add_library( + generator2 + SOURCES Generator2.cpp + HEADERS Generator2.hpp) diff --git a/GridKit/Model/PowerFlow/Generator4/CMakeLists.txt b/GridKit/Model/PowerFlow/Generator4/CMakeLists.txt index 605d496cd..ac6252e2c 100644 --- a/GridKit/Model/PowerFlow/Generator4/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/Generator4/CMakeLists.txt @@ -5,8 +5,7 @@ # - Cameron Rutherford #]] -gridkit_add_library(generator4 - SOURCES - Generator4.cpp - HEADERS - Generator4.hpp) +gridkit_add_library( + generator4 + SOURCES Generator4.cpp + HEADERS Generator4.hpp) diff --git a/GridKit/Model/PowerFlow/Generator4Governor/CMakeLists.txt b/GridKit/Model/PowerFlow/Generator4Governor/CMakeLists.txt index 1b1a27201..41ec72b07 100644 --- a/GridKit/Model/PowerFlow/Generator4Governor/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/Generator4Governor/CMakeLists.txt @@ -5,8 +5,7 @@ # - Cameron Rutherford #]] -gridkit_add_library(generator4governor - SOURCES - Generator4Governor.cpp - HEADERS - Generator4Governor.hpp) +gridkit_add_library( + generator4governor + SOURCES Generator4Governor.cpp + HEADERS Generator4Governor.hpp) diff --git a/GridKit/Model/PowerFlow/Generator4Param/CMakeLists.txt b/GridKit/Model/PowerFlow/Generator4Param/CMakeLists.txt index 400089ef7..48f7f5b39 100644 --- a/GridKit/Model/PowerFlow/Generator4Param/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/Generator4Param/CMakeLists.txt @@ -5,8 +5,7 @@ # - Cameron Rutherford #]] -gridkit_add_library(generator4param - SOURCES - Generator4Param.cpp - HEADERS - Generator4Param.hpp) +gridkit_add_library( + generator4param + SOURCES Generator4Param.cpp + HEADERS Generator4Param.hpp) diff --git a/GridKit/Model/PowerFlow/Load/CMakeLists.txt b/GridKit/Model/PowerFlow/Load/CMakeLists.txt index 81f62ca2e..c00bfc959 100644 --- a/GridKit/Model/PowerFlow/Load/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/Load/CMakeLists.txt @@ -3,8 +3,7 @@ # - Cameron Rutherford #]] -gridkit_add_library(load - SOURCES - Load.cpp - HEADERS - Load.hpp) +gridkit_add_library( + load + SOURCES Load.cpp + HEADERS Load.hpp) diff --git a/GridKit/Model/PowerFlow/MiniGrid/CMakeLists.txt b/GridKit/Model/PowerFlow/MiniGrid/CMakeLists.txt index 4112dbef9..e814b5852 100644 --- a/GridKit/Model/PowerFlow/MiniGrid/CMakeLists.txt +++ b/GridKit/Model/PowerFlow/MiniGrid/CMakeLists.txt @@ -3,8 +3,7 @@ # - Cameron Rutherford #]] -gridkit_add_library(minigrid - SOURCES - MiniGrid.cpp - HEADERS - MiniGrid.hpp) +gridkit_add_library( + minigrid + SOURCES MiniGrid.cpp + HEADERS MiniGrid.hpp) diff --git a/GridKit/Solver/Dynamic/CMakeLists.txt b/GridKit/Solver/Dynamic/CMakeLists.txt index 26e0dca41..2d7fa0152 100644 --- a/GridKit/Solver/Dynamic/CMakeLists.txt +++ b/GridKit/Solver/Dynamic/CMakeLists.txt @@ -5,33 +5,40 @@ # - Cameron Rutherford #]] -set(_install_headers - DynamicSolver.hpp - Ida.hpp) +set(_install_headers DynamicSolver.hpp Ida.hpp) -if (GRIDKIT_ENABLE_SUNDIALS_SPARSE) - gridkit_add_library(solvers_dyn - SOURCES - Ida.cpp - HEADERS - ${_install_headers} +if(GRIDKIT_ENABLE_SUNDIALS_SPARSE) + gridkit_add_library( + solvers_dyn + SOURCES Ida.cpp + HEADERS ${_install_headers} LINK_LIBRARIES - PUBLIC SUNDIALS::nvecserial - PUBLIC SUNDIALS::idas - PUBLIC SUNDIALS::sunlinsolklu - PUBLIC GridKit::definitions - PUBLIC GridKit::utilities_logger - PUBLIC GridKit::sparse_matrix) + PUBLIC + SUNDIALS::nvecserial + PUBLIC + SUNDIALS::idas + PUBLIC + SUNDIALS::sunlinsolklu + PUBLIC + GridKit::definitions + PUBLIC + GridKit::utilities_logger + PUBLIC + GridKit::sparse_matrix) else() - gridkit_add_library(solvers_dyn - SOURCES - Ida.cpp - HEADERS - ${_install_headers} + gridkit_add_library( + solvers_dyn + SOURCES Ida.cpp + HEADERS ${_install_headers} LINK_LIBRARIES - PUBLIC SUNDIALS::nvecserial - PUBLIC SUNDIALS::idas - PUBLIC GridKit::definitions - PUBLIC GridKit::utilities_logger - PUBLIC GridKit::sparse_matrix) + PUBLIC + SUNDIALS::nvecserial + PUBLIC + SUNDIALS::idas + PUBLIC + GridKit::definitions + PUBLIC + GridKit::utilities_logger + PUBLIC + GridKit::sparse_matrix) endif() diff --git a/GridKit/Solver/Optimization/CMakeLists.txt b/GridKit/Solver/Optimization/CMakeLists.txt index 65c57a09a..7df982ccd 100644 --- a/GridKit/Solver/Optimization/CMakeLists.txt +++ b/GridKit/Solver/Optimization/CMakeLists.txt @@ -5,14 +5,12 @@ # - Cameron Rutherford #]] -gridkit_add_library(solvers_opt - SOURCES - DynamicObjective.cpp - DynamicConstraint.cpp - HEADERS - DynamicConstraint.hpp - DynamicObjective.hpp - OptimizationSolver.hpp +gridkit_add_library( + solvers_opt + SOURCES DynamicObjective.cpp DynamicConstraint.cpp + HEADERS DynamicConstraint.hpp DynamicObjective.hpp OptimizationSolver.hpp LINK_LIBRARIES - PUBLIC IPOPT - PUBLIC GridKit::solvers_dyn) + PUBLIC + IPOPT + PUBLIC + GridKit::solvers_dyn) diff --git a/GridKit/Solver/SteadyState/CMakeLists.txt b/GridKit/Solver/SteadyState/CMakeLists.txt index 71d1addf4..c51d1be5b 100644 --- a/GridKit/Solver/SteadyState/CMakeLists.txt +++ b/GridKit/Solver/SteadyState/CMakeLists.txt @@ -5,11 +5,8 @@ # - Cameron Rutherford #]] -gridkit_add_library(solvers_steady - SOURCES - Kinsol.cpp - HEADERS - Kinsol.hpp - SteadyStateSolver.hpp - LINK_LIBRARIES - PUBLIC SUNDIALS::kinsol) +gridkit_add_library( + solvers_steady + SOURCES Kinsol.cpp + HEADERS Kinsol.hpp SteadyStateSolver.hpp + LINK_LIBRARIES PUBLIC SUNDIALS::kinsol) diff --git a/GridKit/Testing/CMakeLists.txt b/GridKit/Testing/CMakeLists.txt index f9297ebb8..477353dd5 100644 --- a/GridKit/Testing/CMakeLists.txt +++ b/GridKit/Testing/CMakeLists.txt @@ -1,15 +1,11 @@ -gridkit_add_library(testing - SOURCES - Testing.cpp - CSV.cpp - HEADERS - Testing.hpp - TestHelpers.hpp - Tokenizer.hpp - OutputAtTime.hpp - CSV.hpp - AggregateErrors.hpp - CommandLine.hpp - LINK_LIBRARIES - PUBLIC GridKit::Utilities - ) +gridkit_add_library( + testing + SOURCES Testing.cpp CSV.cpp + HEADERS Testing.hpp + TestHelpers.hpp + Tokenizer.hpp + OutputAtTime.hpp + CSV.hpp + AggregateErrors.hpp + CommandLine.hpp + LINK_LIBRARIES PUBLIC GridKit::Utilities) diff --git a/GridKit/Utilities/CMakeLists.txt b/GridKit/Utilities/CMakeLists.txt index c8b0a1ed3..478eb11e8 100644 --- a/GridKit/Utilities/CMakeLists.txt +++ b/GridKit/Utilities/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(Utilities INTERFACE) -target_include_directories(Utilities INTERFACE - $ - $) +target_include_directories( + Utilities + INTERFACE $ $) add_library(GridKit::Utilities ALIAS Utilities) @@ -10,10 +10,8 @@ add_subdirectory(CliArgs) install(TARGETS Utilities EXPORT gridkit-targets) install( - FILES - Colors.hpp - Errors.hpp - FileIO.hpp - MapFromCOO.hpp - DESTINATION - include/GridKit/Utilities) + FILES Colors.hpp + Errors.hpp + FileIO.hpp + MapFromCOO.hpp + DESTINATION include/GridKit/Utilities) diff --git a/GridKit/Utilities/CliArgs/CMakeLists.txt b/GridKit/Utilities/CliArgs/CMakeLists.txt index 5e4d70d49..0d6600f66 100644 --- a/GridKit/Utilities/CliArgs/CMakeLists.txt +++ b/GridKit/Utilities/CliArgs/CMakeLists.txt @@ -1,13 +1,12 @@ -gridkit_add_library(utilities_cli_args - SOURCES - CliArgs.cpp - HEADERS - CliArgs.hpp - ArgValue.hpp - ArgVector.hpp - Option.hpp - LINK_LIBRARIES - PUBLIC GridKit::utilities_logger - ) +gridkit_add_library( + utilities_cli_args + SOURCES CliArgs.cpp + HEADERS CliArgs.hpp + ArgValue.hpp + ArgVector.hpp + Option.hpp + LINK_LIBRARIES PUBLIC GridKit::utilities_logger) -target_link_libraries(Utilities INTERFACE GridKit::utilities_cli_args) +target_link_libraries( + Utilities + INTERFACE GridKit::utilities_cli_args) diff --git a/GridKit/Utilities/Logger/CMakeLists.txt b/GridKit/Utilities/Logger/CMakeLists.txt index c68e37b09..a6af51a08 100644 --- a/GridKit/Utilities/Logger/CMakeLists.txt +++ b/GridKit/Utilities/Logger/CMakeLists.txt @@ -1,7 +1,8 @@ -gridkit_add_library(utilities_logger - SOURCES - Logger.cpp - HEADERS - Logger.hpp) +gridkit_add_library( + utilities_logger + SOURCES Logger.cpp + HEADERS Logger.hpp) -target_link_libraries(Utilities INTERFACE GridKit::utilities_logger) +target_link_libraries( + Utilities + INTERFACE GridKit::utilities_logger) diff --git a/application/PhasorDynamics/CMakeLists.txt b/application/PhasorDynamics/CMakeLists.txt index 7e90135bc..512cff899 100644 --- a/application/PhasorDynamics/CMakeLists.txt +++ b/application/PhasorDynamics/CMakeLists.txt @@ -1,12 +1,16 @@ add_executable(PDSim PDSim.cpp) -target_link_libraries(PDSim - PUBLIC - GridKit::phasor_dynamics_components - GridKit::solvers_dyn - GridKit::Utilities - GridKit::testing) -target_include_directories(PDSim PRIVATE - ${GRIDKIT_THIRD_PARTY_DIR}/nlohmann-json/include - ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) +target_link_libraries( + PDSim + PUBLIC GridKit::phasor_dynamics_components + GridKit::solvers_dyn + GridKit::Utilities + GridKit::testing) +target_include_directories( + PDSim + PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/nlohmann-json/include + ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) -install(TARGETS PDSim EXPORT gridkit-targets RUNTIME) +install( + TARGETS PDSim + EXPORT gridkit-targets + RUNTIME) diff --git a/cmake/EnzymeAddLibrary.cmake b/cmake/EnzymeAddLibrary.cmake index 9d7832ee8..5f551f21d 100644 --- a/cmake/EnzymeAddLibrary.cmake +++ b/cmake/EnzymeAddLibrary.cmake @@ -1,4 +1,4 @@ -# +# #[[ Macro to manually compile with Enzyme @@ -13,8 +13,12 @@ macro(enzyme_build_object) set(options) set(oneValueArgs NAME) set(multiValueArgs SOURCES LINK_LIBRARIES INCLUDE_DIRECTORIES) - cmake_parse_arguments(enzyme_build_object "${options}" "${oneValueArgs}" - "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments( + enzyme_build_object + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN}) set(PHASE2 "${CMAKE_CURRENT_BINARY_DIR}/${enzyme_build_object_NAME}.bc") set(PHASE3 "${CMAKE_CURRENT_BINARY_DIR}/${enzyme_build_object_NAME}_enzyme.ll") @@ -30,7 +34,7 @@ macro(enzyme_build_object) get_target_property(libsource ${lib} SOURCES) string(FIND "${libsource}" "TARGET" found) - if(NOT(${found} EQUAL -1)) + if(NOT (${found} EQUAL -1)) list(APPEND LINKER_FLAGS "-Wl,${libsource}") endif() endforeach() @@ -45,15 +49,21 @@ macro(enzyme_build_object) set(PHASE0 "${CMAKE_CURRENT_SOURCE_DIR}/${SRC}") set(PHASE1 "${CMAKE_CURRENT_BINARY_DIR}/${enzyme_build_object_NAME}_${SRC}_compile.o") add_custom_command( - DEPENDS ${PHASE0} + DEPENDS ${PHASE0} OUTPUT ${PHASE1} - COMMAND ${CMAKE_CXX_COMPILER} -flto -c ${PHASE0} ${INCLUDE_COMPILER_LIST} -O2 -fno-vectorize -ffast-math -fno-unroll-loops -fpass-plugin=${ENZYME_CLANG_PLUGIN_LIBRARY} -Xclang -load -Xclang ${ENZYME_CLANG_PLUGIN_LIBRARY} -mllvm -enable-load-pre=0 -mllvm -enzyme-auto-sparsity=1 -o ${PHASE1} - COMMENT "Compiling ${SRC} to object file for target ${enzyme_build_object_NAME}" - ) + COMMAND + ${CMAKE_CXX_COMPILER} -flto -c ${PHASE0} ${INCLUDE_COMPILER_LIST} -O2 -fno-vectorize + -ffast-math -fno-unroll-loops -fpass-plugin=${ENZYME_CLANG_PLUGIN_LIBRARY} -Xclang -load + -Xclang ${ENZYME_CLANG_PLUGIN_LIBRARY} -mllvm -enable-load-pre=0 -mllvm + -enzyme-auto-sparsity=1 -o ${PHASE1} + COMMENT "Compiling ${SRC} to object file for target ${enzyme_build_object_NAME}") set(OBJS "${OBJS} ${PHASE1}") endforeach() - cmake_language(EVAL CODE " + cmake_language( + EVAL + CODE + " add_custom_command( DEPENDS ${OBJS} OUTPUT ${PHASE2} @@ -65,38 +75,40 @@ macro(enzyme_build_object) add_custom_command( DEPENDS ${PHASE2} OUTPUT ${PHASE3} - COMMAND ${GRIDKIT_OPT} ${PHASE2} -load-pass-plugin=${ENZYME_LLVM_PLUGIN_LIBRARY} -passes=enzyme -o ${PHASE3} -S - COMMENT "Running Enzyme opt pass on target ${enzyme_build_object_NAME}" - ) + COMMAND + ${GRIDKIT_OPT} ${PHASE2} -load-pass-plugin=${ENZYME_LLVM_PLUGIN_LIBRARY} -passes=enzyme -o + ${PHASE3} -S + COMMENT "Running Enzyme opt pass on target ${enzyme_build_object_NAME}") add_custom_command( DEPENDS ${PHASE3} OUTPUT ${PHASE4} COMMAND ${GRIDKIT_OPT} ${PHASE3} -O2 -o ${PHASE4} -S - COMMENT "Running remaining opt passes on target ${enzyme_build_object_NAME}" - ) + COMMENT "Running remaining opt passes on target ${enzyme_build_object_NAME}") add_custom_command( DEPENDS ${PHASE4} OUTPUT ${PHASE5} COMMAND ${CMAKE_CXX_COMPILER} -c ${PHASE4} -o ${PHASE5} - COMMENT "Generating optimized object file for target ${enzyme_build_object_NAME}" - ) + COMMENT "Generating optimized object file for target ${enzyme_build_object_NAME}") endmacro() macro(enzyme_add_executable) set(options) set(oneValueArgs NAME) set(multiValueArgs SOURCES LINK_LIBRARIES INCLUDE_DIRECTORIES) - cmake_parse_arguments(enzyme_add_executable "${options}" "${oneValueArgs}" - "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments( + enzyme_add_executable + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN}) enzyme_build_object( NAME "${enzyme_add_executable_NAME}.o" SOURCES ${enzyme_add_executable_SOURCES} LINK_LIBRARIES ${enzyme_add_executable_LINK_LIBRARIES} - INCLUDE_DIRECTORIES ${enzyme_add_executable_INCLUDE_DIRECTORIES} - ) + INCLUDE_DIRECTORIES ${enzyme_add_executable_INCLUDE_DIRECTORIES}) add_executable("${enzyme_add_executable_NAME}" "${enzyme_add_executable_NAME}.o") set_target_properties("${enzyme_add_executable_NAME}" PROPERTIES LINKER_LANGUAGE CXX) @@ -107,15 +119,18 @@ macro(enzyme_add_library) set(options) set(oneValueArgs NAME) set(multiValueArgs SOURCES LINK_LIBRARIES INCLUDE_DIRECTORIES) - cmake_parse_arguments(enzyme_add_library "${options}" "${oneValueArgs}" - "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments( + enzyme_add_library + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN}) enzyme_build_object( NAME "${enzyme_add_library_NAME}.o" SOURCES ${enzyme_add_library_SOURCES} LINK_LIBRARIES ${enzyme_add_library_LINK_LIBRARIES} - INCLUDE_DIRECTORIES ${enzyme_add_library_INCLUDE_DIRECTORIES} - ) + INCLUDE_DIRECTORIES ${enzyme_add_library_INCLUDE_DIRECTORIES}) add_library("${enzyme_add_library_NAME}" "${enzyme_add_library_NAME}.o") set_target_properties("${enzyme_add_library_NAME}" PROPERTIES LINKER_LANGUAGE CXX) diff --git a/cmake/FindEnzyme.cmake b/cmake/FindEnzyme.cmake index ad19c20af..f37f667f9 100644 --- a/cmake/FindEnzyme.cmake +++ b/cmake/FindEnzyme.cmake @@ -1,4 +1,4 @@ -# +# #[[ Finds Enzyme Clang plugin @@ -12,59 +12,55 @@ Author(s): ]] - # Error if CMAKE_BUILD_TYPE is not Release or RelWithDebInfo due to an Enzyme bug -if (NOT ((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))) +if(NOT ((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))) message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") message(FATAL_ERROR "Enzyme builds currently only support Release and RelWithDebInfo as \ CMAKE_BUILD_TYPE due to a bug within the Enzyme library.") endif() # Find Enzyme and necessary programs -find_package(Enzyme REQUIRED CONFIG - PATHS - ${ENZYME_DIR} - ${ENZYME_DIR}/lib/cmake/Enzyme) -message(STATUS "Enzyme configuration found: ${Enzyme_CONFIG}") - -find_library(ENZYME_LLVM_PLUGIN_LIBRARY - NAMES - LLVMEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.so - LLVMEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.dylib - LLVMEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.dll +find_package( + Enzyme + REQUIRED + CONFIG PATHS ${ENZYME_DIR} - ENV LD_LIBRARY_PATH - ENV DYLD_LIBRARY_PATH - PATH_SUFFIXES - lib64 lib - REQUIRED) + ${ENZYME_DIR}/lib/cmake/Enzyme) +message(STATUS "Enzyme configuration found: ${Enzyme_CONFIG}") + +find_library( + ENZYME_LLVM_PLUGIN_LIBRARY + NAMES LLVMEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.so LLVMEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.dylib + LLVMEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.dll + PATHS ${ENZYME_DIR} + ENV + LD_LIBRARY_PATH + ENV + DYLD_LIBRARY_PATH + PATH_SUFFIXES lib64 lib REQUIRED) message(STATUS "Enzyme LLVM plugin library: ${ENZYME_LLVM_PLUGIN_LIBRARY}") -find_library(ENZYME_CLANG_PLUGIN_LIBRARY - NAMES - ClangEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.so - ClangEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.dylib - ClangEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.dll - PATHS - ${ENZYME_DIR} - ENV LD_LIBRARY_PATH - ENV DYLD_LIBRARY_PATH - PATH_SUFFIXES - lib64 lib - REQUIRED) +find_library( + ENZYME_CLANG_PLUGIN_LIBRARY + NAMES ClangEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.so ClangEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.dylib + ClangEnzyme-${Enzyme_LLVM_VERSION_MAJOR}.dll + PATHS ${ENZYME_DIR} + ENV + LD_LIBRARY_PATH + ENV + DYLD_LIBRARY_PATH + PATH_SUFFIXES lib64 lib REQUIRED) message(STATUS "Enzyme Clang plugin library: ${ENZYME_CLANG_PLUGIN_LIBRARY}") -find_program(GRIDKIT_LLVM_LINK llvm-link - PATHS ${Enzyme_LLVM_BINARY_DIR} - PATH_SUFFIXES - bin - REQUIRED) +find_program( + GRIDKIT_LLVM_LINK llvm-link + PATHS ${Enzyme_LLVM_BINARY_DIR} + PATH_SUFFIXES bin REQUIRED) message(STATUS "llvm-link: ${GRIDKIT_LLVM_LINK}") -find_program(GRIDKIT_OPT opt - PATHS ${Enzyme_LLVM_BINARY_DIR} - PATH_SUFFIXES - bin - REQUIRED) +find_program( + GRIDKIT_OPT opt + PATHS ${Enzyme_LLVM_BINARY_DIR} + PATH_SUFFIXES bin REQUIRED) message(STATUS "opt: ${GRIDKIT_OPT}") diff --git a/cmake/FindIpopt.cmake b/cmake/FindIpopt.cmake index 4a99468d8..5dcb63fe5 100644 --- a/cmake/FindIpopt.cmake +++ b/cmake/FindIpopt.cmake @@ -1,4 +1,4 @@ -# +# #[[ Finds Ipopt include directory and libraries and exports target `Ipopt` @@ -11,35 +11,50 @@ Author(s): ]] -find_library(IPOPT_LIBRARY - NAMES - ipopt - PATHS - ${IPOPT_DIR} $ENV{IPOPT_DIR} ${IPOPT_ROOT_DIR} ${IPOPT_LIBRARY_DIR} - ENV LD_LIBRARY_PATH ENV DYLD_LIBRARY_PATH - PATH_SUFFIXES - lib64 lib) +find_library( + IPOPT_LIBRARY + NAMES ipopt + PATHS ${IPOPT_DIR} + $ENV{IPOPT_DIR} + ${IPOPT_ROOT_DIR} + ${IPOPT_LIBRARY_DIR} + ENV + LD_LIBRARY_PATH + ENV + DYLD_LIBRARY_PATH + PATH_SUFFIXES lib64 lib) if(IPOPT_LIBRARY) set(IPOPT_LIBRARY CACHE FILEPATH "Path to Ipopt library") message(STATUS "Found Ipopt library: " ${IPOPT_LIBRARY}) - get_filename_component(IPOPT_LIBRARY_DIR ${IPOPT_LIBRARY} DIRECTORY CACHE "Ipopt library directory") + get_filename_component( + IPOPT_LIBRARY_DIR + ${IPOPT_LIBRARY} + DIRECTORY + CACHE + "Ipopt library directory") mark_as_advanced(IPOPT_LIBRARY IPOPT_LIBRARY_DIR) if(NOT IPOPT_DIR) - get_filename_component(IPOPT_DIR ${IPOPT_LIBRARY_DIR} DIRECTORY CACHE) + get_filename_component( + IPOPT_DIR + ${IPOPT_LIBRARY_DIR} + DIRECTORY + CACHE) endif() endif() -find_path(IPOPT_INCLUDE_DIR - NAMES - IpTNLP.hpp - PATHS - ${IPOPT_DIR} ${IPOPT_ROOT_DIR} $ENV{IPOPT_DIR} ${IPOPT_LIBRARY_DIR}/.. +find_path( + IPOPT_INCLUDE_DIR + NAMES IpTNLP.hpp + PATHS ${IPOPT_DIR} + ${IPOPT_ROOT_DIR} + $ENV{IPOPT_DIR} + ${IPOPT_LIBRARY_DIR}/.. PATH_SUFFIXES - include - include/coin - include/coin-or - include/coinor) + include + include/coin + include/coin-or + include/coinor) if(IPOPT_LIBRARY) message(STATUS "Found Ipopt include: ${IPOPT_INCLUDE_DIR}") @@ -50,7 +65,9 @@ if(IPOPT_LIBRARY) else() if(NOT IPOPT_ROOT_DIR) message(STATUS "Ipopt dir not found! Please provide correct filepath.") - set(IPOPT_DIR ${IPOPT_DIR} CACHE PATH "Path to Ipopt installation root.") + set(IPOPT_DIR + ${IPOPT_DIR} + CACHE PATH "Path to Ipopt installation root.") unset(IPOPT_INCLUDE_DIR CACHE) unset(IPOPT_LIBRARY CACHE) unset(IPOPT_LIBRARY_DIR CACHE) diff --git a/cmake/FindSuiteSparse.cmake b/cmake/FindSuiteSparse.cmake index e8a05cd72..8428b0d60 100644 --- a/cmake/FindSuiteSparse.cmake +++ b/cmake/FindSuiteSparse.cmake @@ -11,42 +11,54 @@ Author(s): ]] set(SUITESPARSE_MODULES - amd - colamd - klu - suitesparseconfig) + amd + colamd + klu + suitesparseconfig) -find_library(SUITESPARSE_LIBRARY - NAMES - ${SUITESPARSE_MODULES} - PATHS - ${SUITESPARSE_DIR} $ENV{SUITESPARSE_DIR} ${SUITESPARSE_ROOT_DIR} - ENV LD_LIBRARY_PATH ENV DYLD_LIBRARY_PATH - PATH_SUFFIXES - lib64 lib) +find_library( + SUITESPARSE_LIBRARY + NAMES ${SUITESPARSE_MODULES} + PATHS ${SUITESPARSE_DIR} + $ENV{SUITESPARSE_DIR} + ${SUITESPARSE_ROOT_DIR} + ENV + LD_LIBRARY_PATH + ENV + DYLD_LIBRARY_PATH + PATH_SUFFIXES lib64 lib) if(SUITESPARSE_LIBRARY) set(SUITESPARSE_LIBRARY CACHE FILEPATH "Path to Suitesparse library") - get_filename_component(SUITESPARSE_LIBRARY_DIR ${SUITESPARSE_LIBRARY} DIRECTORY CACHE "Suitesparse library directory") + get_filename_component( + SUITESPARSE_LIBRARY_DIR + ${SUITESPARSE_LIBRARY} + DIRECTORY + CACHE + "Suitesparse library directory") message(STATUS "Found Suitesparse libraries in: " ${SUITESPARSE_LIBRARY_DIR}) mark_as_advanced(SUITESPARSE_LIBRARY SUITESPARSE_LIBRARY_DIR) if(NOT SUITESPARSE_DIR) - get_filename_component(SUITESPARSE_DIR ${SUITESPARSE_LIBRARY_DIR} DIRECTORY CACHE) + get_filename_component( + SUITESPARSE_DIR + ${SUITESPARSE_LIBRARY_DIR} + DIRECTORY + CACHE) endif() endif() # Find SUITESPARSE header path and ensure all needed files are there -find_path(SUITESPARSE_INCLUDE_DIR - NAMES - amd.h - colamd.h - klu.h - SuiteSparse_config.h - PATHS - ${SUITESPARSE_DIR} $ENV{SUITESPARSE_DIR} ${SUITESPARSE_ROOT_DIR} ${SUITESPARSE_LIBRARY_DIR}/.. - PATH_SUFFIXES - include - include/suitesparse) +find_path( + SUITESPARSE_INCLUDE_DIR + NAMES amd.h + colamd.h + klu.h + SuiteSparse_config.h + PATHS ${SUITESPARSE_DIR} + $ENV{SUITESPARSE_DIR} + ${SUITESPARSE_ROOT_DIR} + ${SUITESPARSE_LIBRARY_DIR}/.. + PATH_SUFFIXES include include/suitesparse) if(SUITESPARSE_LIBRARY) message(STATUS "Found Suitesparse include: ${SUITESPARSE_INCLUDE_DIR}") @@ -55,7 +67,8 @@ if(SUITESPARSE_LIBRARY) add_library(SUITESPARSE INTERFACE IMPORTED) target_include_directories(SUITESPARSE INTERFACE ${SUITESPARSE_INCLUDE_DIR}) foreach(mod ${SUITESPARSE_MODULES}) - find_library(suitesparse_${mod} + find_library( + suitesparse_${mod} NAMES ${mod} HINTS ${SUITESPARSE_LIBRARY_DIR}) if(suitesparse_${mod}) @@ -69,7 +82,9 @@ if(SUITESPARSE_LIBRARY) else() if(NOT SUITESPARSE_ROOT_DIR) message(STATUS "Suitesparse dir not found! Please provide correct filepath.") - set(SUITESPARSE_DIR ${SUITESPARSE_DIR} CACHE PATH "Path to Suitesparse installation root.") + set(SUITESPARSE_DIR + ${SUITESPARSE_DIR} + CACHE PATH "Path to Suitesparse installation root.") unset(SUITESPARSE_LIBRARY CACHE) unset(SUITESPARSE_INCLUDE_DIR CACHE) unset(SUITESPARSE_LIBRARY_DIR CACHE) diff --git a/cmake/GridkitAddLibrary.cmake b/cmake/GridkitAddLibrary.cmake index 084df3eaa..3405b0cce 100644 --- a/cmake/GridkitAddLibrary.cmake +++ b/cmake/GridkitAddLibrary.cmake @@ -1,4 +1,3 @@ - # [[ # Author(s): # - Cameron Rutherford @@ -36,8 +35,12 @@ macro(gridkit_add_library target) COMPILE_OPTIONS) # parse arguments - cmake_parse_arguments(gridkit_add_library - "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments( + gridkit_add_library + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN}) # add library with sources add_library(${target} ${gridkit_add_library_SOURCES}) @@ -49,12 +52,10 @@ macro(gridkit_add_library target) endif() # set include dirs - target_include_directories(${target} PUBLIC - $ - $) + target_include_directories(${target} PUBLIC $ + $) if(gridkit_add_library_INCLUDE_DIRECTORIES) - target_include_directories(${target} - ${gridkit_add_library_INCLUDE_DIRECTORIES}) + target_include_directories(${target} ${gridkit_add_library_INCLUDE_DIRECTORIES}) endif() # add compile options @@ -76,18 +77,23 @@ macro(gridkit_add_library target) set_target_properties(${target} PROPERTIES OUTPUT_NAME ${_output_name}) # set the library version - set_target_properties(${target} PROPERTIES - VERSION ${GridKit_VERSION} - SOVERSION ${GridKit_VERSION_MAJOR}) + set_target_properties(${target} PROPERTIES VERSION ${GridKit_VERSION} SOVERSION + ${GridKit_VERSION_MAJOR}) # install - install(TARGETS ${target} DESTINATION lib EXPORT gridkit-targets) + install( + TARGETS ${target} + DESTINATION lib + EXPORT gridkit-targets) if(gridkit_add_library_HEADERS) - cmake_path(RELATIVE_PATH CMAKE_CURRENT_SOURCE_DIR - BASE_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE _rel_path) - install(FILES ${gridkit_add_library_HEADERS} - DESTINATION include/${_rel_path}) + cmake_path( + RELATIVE_PATH + CMAKE_CURRENT_SOURCE_DIR + BASE_DIRECTORY + ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE + _rel_path) + install(FILES ${gridkit_add_library_HEADERS} DESTINATION include/${_rel_path}) endif() endmacro() diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 03979316b..0b0368213 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,15 +1,14 @@ find_package(Doxygen) if(${DOXYGEN_FOUND}) - set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") - set(DOXYGEN_USE_MDFILE_AS_MAINPAGE ${CMAKE_SOURCE_DIR}/README.md) - set(DOXYGEN_GENERATE_TREEVIEW YES) - set(DOXYGEN_TEMPLATE_RELATIONS YES) - set(DOXYGEN_BUILTIN_STL_SUPPORT YES) - set(DOXYGEN_EXTRACT_PRIVATE YES) - set(DOXYGEN_SOURCE_BROWSER YES) - set(DOXYGEN_INTERACTIVE_SVG YES) - set(DOXYGEN_DISTRIBUTE_GROUP_DOC YES) + set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") + set(DOXYGEN_USE_MDFILE_AS_MAINPAGE ${CMAKE_SOURCE_DIR}/README.md) + set(DOXYGEN_GENERATE_TREEVIEW YES) + set(DOXYGEN_TEMPLATE_RELATIONS YES) + set(DOXYGEN_BUILTIN_STL_SUPPORT YES) + set(DOXYGEN_EXTRACT_PRIVATE YES) + set(DOXYGEN_SOURCE_BROWSER YES) + set(DOXYGEN_INTERACTIVE_SVG YES) + set(DOXYGEN_DISTRIBUTE_GROUP_DOC YES) - doxygen_add_docs(GridKitDocs ${CMAKE_SOURCE_DIR}/GridKit - ${CMAKE_SOURCE_DIR}/README.md) + doxygen_add_docs(GridKitDocs ${CMAKE_SOURCE_DIR}/GridKit ${CMAKE_SOURCE_DIR}/README.md) endif() diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index bfa814d2a..2563eb671 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -7,16 +7,20 @@ set(GRIDKIT_EXAMPLES_INSTALL_ROOT "share/gridkit/examples") # # gridkit_example_current_install_path() -# +# # Get the full installation destination for the current example directory. -# +# # Result is stored in # macro(gridkit_example_current_install_path _out) - cmake_path(RELATIVE_PATH CMAKE_CURRENT_SOURCE_DIR - BASE_DIRECTORY ${CMAKE_SOURCE_DIR}/examples - OUTPUT_VARIABLE _rel_path) - set(${_out} ${GRIDKIT_EXAMPLES_INSTALL_ROOT}/${_rel_path}) + cmake_path( + RELATIVE_PATH + CMAKE_CURRENT_SOURCE_DIR + BASE_DIRECTORY + ${CMAKE_SOURCE_DIR}/examples + OUTPUT_VARIABLE + _rel_path) + set(${_out} ${GRIDKIT_EXAMPLES_INSTALL_ROOT}/${_rel_path}) endmacro() # @@ -25,20 +29,20 @@ endmacro() # This macro will add a file (e.g., JSON) that is needed for an example to the # build tree and the install tree following the same directory structure as the # source tree under `examples`. -# +# # must exist in the CMAKE_CURRENT_SOURCE_DIR where this macro is # called. # macro(gridkit_example_add_file _filename) - get_filename_component(__fname ${_filename} NAME) - set(_source_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${__fname}) - if(NOT EXISTS ${_source_filepath}) - message(FATAL_ERROR "File does not exist: ${_source_filepath}") - endif() - set(_binary_filepath ${CMAKE_CURRENT_BINARY_DIR}/${__fname}) - configure_file(${_source_filepath} ${_binary_filepath} COPYONLY) - gridkit_example_current_install_path(_ex_install_path) - install(FILES ${_filename} DESTINATION ${_ex_install_path}) + get_filename_component(__fname ${_filename} NAME) + set(_source_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${__fname}) + if(NOT EXISTS ${_source_filepath}) + message(FATAL_ERROR "File does not exist: ${_source_filepath}") + endif() + set(_binary_filepath ${CMAKE_CURRENT_BINARY_DIR}/${__fname}) + configure_file(${_source_filepath} ${_binary_filepath} COPYONLY) + gridkit_example_current_install_path(_ex_install_path) + install(FILES ${_filename} DESTINATION ${_ex_install_path}) endmacro() add_subdirectory(LinearAlgebra) diff --git a/examples/Consumer/CMakeLists.txt b/examples/Consumer/CMakeLists.txt index 6d07fcfc4..eebcd54bb 100644 --- a/examples/Consumer/CMakeLists.txt +++ b/examples/Consumer/CMakeLists.txt @@ -12,12 +12,12 @@ if(GRIDKIT_ENABLE_SUNDIALS) FILES ${_examples_dir}/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasicJson.cpp DESTINATION ${_rel_consumer_path} RENAME consumer.cpp) - install( - FILES - ${_examples_dir}/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasic.hpp - ${_examples_dir}/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasic.case.json - DESTINATION ${_rel_consumer_path}) - list(APPEND GRIDKIT_CONSUMER_TEST_LINK_LIBRARIES + install(FILES ${_examples_dir}/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasic.hpp + ${_examples_dir}/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasic.case.json + DESTINATION ${_rel_consumer_path}) + list( + APPEND + GRIDKIT_CONSUMER_TEST_LINK_LIBRARIES GridKit::phasor_dynamics_components GridKit::solvers_dyn) else() @@ -25,7 +25,9 @@ else() FILES ${_examples_dir}/PowerElectronics/DistributedGeneratorTest/DGTest.cpp DESTINATION ${_rel_consumer_path} RENAME consumer.cpp) - list(APPEND GRIDKIT_CONSUMER_TEST_LINK_LIBRARIES + list( + APPEND + GRIDKIT_CONSUMER_TEST_LINK_LIBRARIES GridKit::power_elec_disgen GridKit::power_elec_microline GridKit::power_elec_microload) @@ -33,11 +35,10 @@ endif() # Install CMakeLists.txt for example project configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GridKitConsumer/CMakeLists.txt.in - ${CMAKE_CURRENT_BINARY_DIR}/GridKitConsumer/CMakeLists.txt - @ONLY) + ${CMAKE_CURRENT_BINARY_DIR}/GridKitConsumer/CMakeLists.txt @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GridKitConsumer/CMakeLists.txt - DESTINATION ${_rel_consumer_path}) + DESTINATION ${_rel_consumer_path}) # Add target to build and test the example project after install -add_custom_target(test_install COMMAND - ${_abs_consumer_path}/test.sh ${CMAKE_INSTALL_PREFIX} ${CMAKE_CXX_COMPILER}) +add_custom_target( + test_install COMMAND ${_abs_consumer_path}/test.sh ${CMAKE_INSTALL_PREFIX} ${CMAKE_CXX_COMPILER}) diff --git a/examples/Enzyme/Library/Scalar/CMakeLists.txt b/examples/Enzyme/Library/Scalar/CMakeLists.txt index 07ce977f0..8501f2ce6 100644 --- a/examples/Enzyme/Library/Scalar/CMakeLists.txt +++ b/examples/Enzyme/Library/Scalar/CMakeLists.txt @@ -1,4 +1,5 @@ add_executable(EnzymeLibScalarCheck EnzymeScalar.cpp ScalarModel.cpp) -target_link_libraries(EnzymeLibScalarCheck ClangEnzymeFlags GridKit::Utilities) +target_link_libraries( + EnzymeLibScalarCheck ClangEnzymeFlags GridKit::Utilities) add_test(NAME "EnzymeLibScalarCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeLibScalarCheck) diff --git a/examples/Enzyme/Library/Vector/CMakeLists.txt b/examples/Enzyme/Library/Vector/CMakeLists.txt index 434a33a6e..fcf24d19f 100644 --- a/examples/Enzyme/Library/Vector/CMakeLists.txt +++ b/examples/Enzyme/Library/Vector/CMakeLists.txt @@ -1,7 +1,8 @@ add_executable(EnzymeLibVectorCheck EnzymeVector.cpp VectorModel.cpp) -target_link_libraries(EnzymeLibVectorCheck - ClangEnzymeFlags - GridKit::DenseMatrix - GridKit::Utilities) +target_link_libraries( + EnzymeLibVectorCheck + ClangEnzymeFlags + GridKit::DenseMatrix + GridKit::Utilities) add_test(NAME "EnzymeLibVectorCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeLibVectorCheck) diff --git a/examples/Enzyme/PowerElectronics/CMakeLists.txt b/examples/Enzyme/PowerElectronics/CMakeLists.txt index e3f3aa2ab..036be655e 100644 --- a/examples/Enzyme/PowerElectronics/CMakeLists.txt +++ b/examples/Enzyme/PowerElectronics/CMakeLists.txt @@ -1,9 +1,12 @@ add_executable(EnzymePowerElectronicsCheck main.cpp) -target_compile_options(EnzymePowerElectronicsCheck PUBLIC -fno-vectorize -ffast-math -fno-unroll-loops) -target_link_libraries(EnzymePowerElectronicsCheck - ClangEnzymeFlags - GridKit::DenseMatrix - GridKit::power_elec_disgen - GridKit::Utilities) +target_compile_options(EnzymePowerElectronicsCheck PUBLIC -fno-vectorize -ffast-math + -fno-unroll-loops) +target_link_libraries( + EnzymePowerElectronicsCheck + ClangEnzymeFlags + GridKit::DenseMatrix + GridKit::power_elec_disgen + GridKit::Utilities) -add_test(NAME "EnzymePowerElectronicsCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymePowerElectronicsCheck) +add_test(NAME "EnzymePowerElectronicsCheck" + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymePowerElectronicsCheck) diff --git a/examples/Enzyme/Standalone/CMakeLists.txt b/examples/Enzyme/Standalone/CMakeLists.txt index defca0dc1..0de8756d2 100644 --- a/examples/Enzyme/Standalone/CMakeLists.txt +++ b/examples/Enzyme/Standalone/CMakeLists.txt @@ -1,19 +1,25 @@ add_executable(EnzymeStandaloneScalarCheck EnzymeScalar.cpp) -target_link_libraries(EnzymeStandaloneScalarCheck ClangEnzymeFlags GridKit::Utilities) +target_link_libraries( + EnzymeStandaloneScalarCheck ClangEnzymeFlags GridKit::Utilities) add_executable(EnzymeStandaloneVectorCheck EnzymeVector.cpp) -target_link_libraries(EnzymeStandaloneVectorCheck - ClangEnzymeFlags - GridKit::DenseMatrix - GridKit::Utilities) +target_link_libraries( + EnzymeStandaloneVectorCheck + ClangEnzymeFlags + GridKit::DenseMatrix + GridKit::Utilities) add_executable(EnzymeStandaloneSparseCheck EnzymeSparse.cpp) target_compile_options(EnzymeStandaloneSparseCheck PUBLIC -mllvm -enzyme-auto-sparsity=1) -target_link_libraries(EnzymeStandaloneSparseCheck - ClangEnzymeFlags - GridKit::sparse_matrix - GridKit::Utilities) +target_link_libraries( + EnzymeStandaloneSparseCheck + ClangEnzymeFlags + GridKit::sparse_matrix + GridKit::Utilities) -add_test(NAME "EnzymeStandaloneScalarCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeStandaloneScalarCheck) -add_test(NAME "EnzymeStandaloneVectorCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeStandaloneVectorCheck) -add_test(NAME "EnzymeStandaloneSparseCheck" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeStandaloneSparseCheck) +add_test(NAME "EnzymeStandaloneScalarCheck" + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeStandaloneScalarCheck) +add_test(NAME "EnzymeStandaloneVectorCheck" + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeStandaloneVectorCheck) +add_test(NAME "EnzymeStandaloneSparseCheck" + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EnzymeStandaloneSparseCheck) diff --git a/examples/Experimental/AdjointSensitivity/CMakeLists.txt b/examples/Experimental/AdjointSensitivity/CMakeLists.txt index a1d94b607..57d236db1 100644 --- a/examples/Experimental/AdjointSensitivity/CMakeLists.txt +++ b/examples/Experimental/AdjointSensitivity/CMakeLists.txt @@ -6,7 +6,11 @@ #]] add_executable(adjoint AdjointSensitivity.cpp) -target_link_libraries(adjoint GridKit::bus GridKit::generator4 GridKit::solvers_dyn) +target_link_libraries( + adjoint + GridKit::bus + GridKit::generator4 + GridKit::solvers_dyn) install(TARGETS adjoint DESTINATION bin) -add_test(NAME AdjointSens COMMAND $ ) +add_test(NAME AdjointSens COMMAND $) diff --git a/examples/Experimental/DynamicConstrainedOpt/CMakeLists.txt b/examples/Experimental/DynamicConstrainedOpt/CMakeLists.txt index 1742cf0c3..c43129936 100644 --- a/examples/Experimental/DynamicConstrainedOpt/CMakeLists.txt +++ b/examples/Experimental/DynamicConstrainedOpt/CMakeLists.txt @@ -7,12 +7,13 @@ #]] add_executable(dynconopt DynamicConstrainedOpt.cpp) -target_link_libraries(dynconopt - GridKit::generator4 - GridKit::generator2 - GridKit::bus GridKit::solvers_dyn - GridKit::solvers_opt -) +target_link_libraries( + dynconopt + GridKit::generator4 + GridKit::generator2 + GridKit::bus + GridKit::solvers_dyn + GridKit::solvers_opt) # Fortran linker needed to link to HSL solvers set_property(TARGET dynconopt PROPERTY LINKER_LANGUAGE Fortran) install(TARGETS dynconopt DESTINATION bin) diff --git a/examples/Experimental/GenConstLoad/CMakeLists.txt b/examples/Experimental/GenConstLoad/CMakeLists.txt index d777ebe7d..51a8edf8b 100644 --- a/examples/Experimental/GenConstLoad/CMakeLists.txt +++ b/examples/Experimental/GenConstLoad/CMakeLists.txt @@ -7,12 +7,13 @@ #]] add_executable(genconstload GenConstLoad.cpp) -target_link_libraries(genconstload - GridKit::generator4governor - GridKit::bus GridKit::load - GridKit::solvers_dyn - GridKit::solvers_opt -) +target_link_libraries( + genconstload + GridKit::generator4governor + GridKit::bus + GridKit::load + GridKit::solvers_dyn + GridKit::solvers_opt) # Fortran linker needed to link to HSL solvers set_property(TARGET genconstload PROPERTY LINKER_LANGUAGE Fortran) install(TARGETS genconstload DESTINATION bin) diff --git a/examples/Experimental/GenInfiniteBus/CMakeLists.txt b/examples/Experimental/GenInfiniteBus/CMakeLists.txt index d96e288a5..a8f2fa348 100644 --- a/examples/Experimental/GenInfiniteBus/CMakeLists.txt +++ b/examples/Experimental/GenInfiniteBus/CMakeLists.txt @@ -7,12 +7,12 @@ #]] add_executable(geninfbus GenInfiniteBus.cpp) -target_link_libraries(geninfbus - GridKit::bus - GridKit::generator4 - GridKit::solvers_opt - GridKit::solvers_dyn -) +target_link_libraries( + geninfbus + GridKit::bus + GridKit::generator4 + GridKit::solvers_opt + GridKit::solvers_dyn) # Fortran linker needed to link to HSL solvers set_property(TARGET geninfbus PROPERTY LINKER_LANGUAGE Fortran) install(TARGETS geninfbus DESTINATION bin) diff --git a/examples/Experimental/ParameterEstimation/CMakeLists.txt b/examples/Experimental/ParameterEstimation/CMakeLists.txt index 9f20dab62..e3d53f324 100644 --- a/examples/Experimental/ParameterEstimation/CMakeLists.txt +++ b/examples/Experimental/ParameterEstimation/CMakeLists.txt @@ -7,13 +7,13 @@ #]] add_executable(paramest ParameterEstimation.cpp) -target_link_libraries(paramest +target_link_libraries( + paramest GridKit::bus GridKit::generator4param GridKit::solvers_opt GridKit::solvers_dyn - GridKit::Utilities -) + GridKit::Utilities) # Fortran linker needed to link to HSL solvers set_property(TARGET paramest PROPERTY LINKER_LANGUAGE Fortran) install(TARGETS paramest RUNTIME DESTINATION bin) diff --git a/examples/LinearAlgebra/CMakeLists.txt b/examples/LinearAlgebra/CMakeLists.txt index 553b0587e..aaad9baf7 100644 --- a/examples/LinearAlgebra/CMakeLists.txt +++ b/examples/LinearAlgebra/CMakeLists.txt @@ -1,3 +1,2 @@ - add_subdirectory(SparseTest) add_subdirectory(DenseTest) diff --git a/examples/LinearAlgebra/DenseTest/CMakeLists.txt b/examples/LinearAlgebra/DenseTest/CMakeLists.txt index bbe89db35..17ea79b4f 100644 --- a/examples/LinearAlgebra/DenseTest/CMakeLists.txt +++ b/examples/LinearAlgebra/DenseTest/CMakeLists.txt @@ -1,6 +1,6 @@ - add_executable(densemattest DenseTest.cpp) -target_link_libraries(densemattest GridKit::DenseMatrix) - +target_link_libraries( + densemattest GridKit::DenseMatrix) + add_test(NAME DenseMatrixTest COMMAND $) install(TARGETS densemattest RUNTIME DESTINATION bin) diff --git a/examples/LinearAlgebra/SparseTest/CMakeLists.txt b/examples/LinearAlgebra/SparseTest/CMakeLists.txt index 4b0e608fe..abda11b7f 100644 --- a/examples/LinearAlgebra/SparseTest/CMakeLists.txt +++ b/examples/LinearAlgebra/SparseTest/CMakeLists.txt @@ -1,7 +1,6 @@ - - add_executable(spmattest SparseTest.cpp) -target_link_libraries(spmattest GridKit::sparse_matrix) - +target_link_libraries( + spmattest GridKit::sparse_matrix) + add_test(NAME SparseMatrixTest COMMAND spmattest) install(TARGETS spmattest RUNTIME DESTINATION bin) diff --git a/examples/PhasorDynamics/Large/Illinois/CMakeLists.txt b/examples/PhasorDynamics/Large/Illinois/CMakeLists.txt index 3af588d78..547365ffe 100644 --- a/examples/PhasorDynamics/Large/Illinois/CMakeLists.txt +++ b/examples/PhasorDynamics/Large/Illinois/CMakeLists.txt @@ -1,6 +1,7 @@ gridkit_example_add_file(illinois.json) gridkit_example_add_file(illinois.solver.json) -add_test(NAME illinois_pdsim - COMMAND PDSim illinois.solver.json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME illinois_pdsim + COMMAND PDSim illinois.solver.json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Large/Texas/CMakeLists.txt b/examples/PhasorDynamics/Large/Texas/CMakeLists.txt index 97e0a511a..462f22b4c 100644 --- a/examples/PhasorDynamics/Large/Texas/CMakeLists.txt +++ b/examples/PhasorDynamics/Large/Texas/CMakeLists.txt @@ -1,6 +1,7 @@ gridkit_example_add_file(texas.json) gridkit_example_add_file(texas.solver.json) -add_test(NAME texas_pdsim - COMMAND PDSim texas.solver.json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME texas_pdsim + COMMAND PDSim texas.solver.json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Large/WECC/CMakeLists.txt b/examples/PhasorDynamics/Large/WECC/CMakeLists.txt index 6f2927018..fc17914c2 100644 --- a/examples/PhasorDynamics/Large/WECC/CMakeLists.txt +++ b/examples/PhasorDynamics/Large/WECC/CMakeLists.txt @@ -1,6 +1,7 @@ gridkit_example_add_file(wecc.json) gridkit_example_add_file(wecc.solver.json) -add_test(NAME wecc_pdsim - COMMAND PDSim wecc.solver.json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME wecc_pdsim + COMMAND PDSim wecc.solver.json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Medium/Hawaii/CMakeLists.txt b/examples/PhasorDynamics/Medium/Hawaii/CMakeLists.txt index c77fb8db2..7c6b1aa28 100644 --- a/examples/PhasorDynamics/Medium/Hawaii/CMakeLists.txt +++ b/examples/PhasorDynamics/Medium/Hawaii/CMakeLists.txt @@ -1,6 +1,7 @@ gridkit_example_add_file(hawaii.json) gridkit_example_add_file(hawaii.solver.json) -add_test(NAME hawaii_pdsim - COMMAND PDSim hawaii.solver.json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME hawaii_pdsim + COMMAND PDSim hawaii.solver.json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Medium/NewEngland/CMakeLists.txt b/examples/PhasorDynamics/Medium/NewEngland/CMakeLists.txt index e2c1b4b77..af0eebe1d 100644 --- a/examples/PhasorDynamics/Medium/NewEngland/CMakeLists.txt +++ b/examples/PhasorDynamics/Medium/NewEngland/CMakeLists.txt @@ -1,6 +1,7 @@ gridkit_example_add_file(newengland.json) gridkit_example_add_file(newengland.solver.json) -add_test(NAME newengland_pdsim - COMMAND PDSim newengland.solver.json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME newengland_pdsim + COMMAND PDSim newengland.solver.json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Small/TenGen/Classical/CMakeLists.txt b/examples/PhasorDynamics/Small/TenGen/Classical/CMakeLists.txt index 72a043616..8896e85ab 100644 --- a/examples/PhasorDynamics/Small/TenGen/Classical/CMakeLists.txt +++ b/examples/PhasorDynamics/Small/TenGen/Classical/CMakeLists.txt @@ -1,7 +1,6 @@ add_executable(TenGenClassical TenGenClassical.cpp) -target_link_libraries(TenGenClassical - GridKit::phasor_dynamics_components - GridKit::solvers_dyn) +target_link_libraries( + TenGenClassical GridKit::phasor_dynamics_components GridKit::solvers_dyn) install(TARGETS TenGenClassical RUNTIME DESTINATION bin) # Not used for tesing for now. diff --git a/examples/PhasorDynamics/Small/TenGen/Genrou/CMakeLists.txt b/examples/PhasorDynamics/Small/TenGen/Genrou/CMakeLists.txt index c5ee2d800..2c77f482e 100644 --- a/examples/PhasorDynamics/Small/TenGen/Genrou/CMakeLists.txt +++ b/examples/PhasorDynamics/Small/TenGen/Genrou/CMakeLists.txt @@ -1,7 +1,6 @@ add_executable(TenGenGenrou TenGenGenrou.cpp) -target_link_libraries(TenGenGenrou - GridKit::phasor_dynamics_components - GridKit::solvers_dyn) +target_link_libraries( + TenGenGenrou GridKit::phasor_dynamics_components GridKit::solvers_dyn) install(TARGETS TenGenGenrou RUNTIME DESTINATION bin) # Not used for tesing for now. diff --git a/examples/PhasorDynamics/Tiny/ThreeBus/Basic/CMakeLists.txt b/examples/PhasorDynamics/Tiny/ThreeBus/Basic/CMakeLists.txt index 5f97c09d6..6464deead 100644 --- a/examples/PhasorDynamics/Tiny/ThreeBus/Basic/CMakeLists.txt +++ b/examples/PhasorDynamics/Tiny/ThreeBus/Basic/CMakeLists.txt @@ -1,28 +1,28 @@ gridkit_example_current_install_path(_install_path) add_executable(ThreeBusBasic ThreeBusBasic.cpp) -target_link_libraries(ThreeBusBasic - GridKit::phasor_dynamics_components - GridKit::solvers_dyn) +target_link_libraries( + ThreeBusBasic GridKit::phasor_dynamics_components GridKit::solvers_dyn) install(TARGETS ThreeBusBasic RUNTIME DESTINATION ${_install_path}) add_executable(ThreeBusBasicJson ThreeBusBasicJson.cpp) -target_link_libraries(ThreeBusBasicJson - GridKit::phasor_dynamics_components - GridKit::solvers_dyn - GridKit::utilities_cli_args - GridKit::testing) +target_link_libraries( + ThreeBusBasicJson + GridKit::phasor_dynamics_components + GridKit::solvers_dyn + GridKit::utilities_cli_args + GridKit::testing) install(TARGETS ThreeBusBasicJson RUNTIME DESTINATION ${_install_path}) gridkit_example_add_file(ThreeBusBasic.case.json) gridkit_example_add_file(ThreeBusBasic.ref.csv) add_test(NAME ThreeBusBasic COMMAND ThreeBusBasic) -add_test(NAME ThreeBusBasicJson - COMMAND ThreeBusBasicJson - --case ThreeBusBasic.case.json - --compare mon.csv ThreeBusBasic.ref.csv) +add_test( + NAME ThreeBusBasicJson + COMMAND ThreeBusBasicJson --case ThreeBusBasic.case.json --compare mon.csv ThreeBusBasic.ref.csv) gridkit_example_add_file(ThreeBusBasic.solver.json) -add_test(NAME ThreeBusBasic_pdsim - COMMAND PDSim ThreeBusBasic.solver.json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME ThreeBusBasic_pdsim + COMMAND PDSim ThreeBusBasic.solver.json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Tiny/ThreeBus/Classical/CMakeLists.txt b/examples/PhasorDynamics/Tiny/ThreeBus/Classical/CMakeLists.txt index 8499e0cd0..76e56620f 100644 --- a/examples/PhasorDynamics/Tiny/ThreeBus/Classical/CMakeLists.txt +++ b/examples/PhasorDynamics/Tiny/ThreeBus/Classical/CMakeLists.txt @@ -6,22 +6,21 @@ gridkit_example_current_install_path(_install_path) add_executable(ThreeBusClassical ThreeBusClassical.cpp) -target_link_libraries(ThreeBusClassical - GridKit::phasor_dynamics_components - GridKit::solvers_dyn) +target_link_libraries( + ThreeBusClassical GridKit::phasor_dynamics_components GridKit::solvers_dyn) install(TARGETS ThreeBusClassical RUNTIME DESTINATION ${_install_path}) add_executable(ThreeBusClassicalJson ThreeBusClassicalJson.cpp) -target_link_libraries(ThreeBusClassicalJson - GridKit::phasor_dynamics_components - GridKit::solvers_dyn) +target_link_libraries( + ThreeBusClassicalJson GridKit::phasor_dynamics_components GridKit::solvers_dyn) install(TARGETS ThreeBusClassicalJson RUNTIME DESTINATION ${_install_path}) gridkit_example_add_file(ThreeBusClassical.json) add_test(NAME ThreeBusClassical COMMAND ThreeBusClassical) -add_test(NAME ThreeBusClassicalJson - COMMAND - ThreeBusClassicalJson ${CMAKE_CURRENT_BINARY_DIR}/ThreeBusClassical.json) -add_test(NAME ThreeBusClassicalJson_no_arg - COMMAND ThreeBusClassicalJson - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME ThreeBusClassicalJson + COMMAND ThreeBusClassicalJson ${CMAKE_CURRENT_BINARY_DIR}/ThreeBusClassical.json) +add_test( + NAME ThreeBusClassicalJson_no_arg + COMMAND ThreeBusClassicalJson + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Tiny/ThreeBus/ZipLoad/CMakeLists.txt b/examples/PhasorDynamics/Tiny/ThreeBus/ZipLoad/CMakeLists.txt index 8f75c0fcc..18030a58c 100644 --- a/examples/PhasorDynamics/Tiny/ThreeBus/ZipLoad/CMakeLists.txt +++ b/examples/PhasorDynamics/Tiny/ThreeBus/ZipLoad/CMakeLists.txt @@ -1,9 +1,7 @@ - gridkit_example_current_install_path(_install_path) add_executable(ThreeBusZipLoadJson ThreeBusZipLoadJson.cpp) -target_link_libraries(ThreeBusZipLoadJson - GridKit::phasor_dynamics_components - GridKit::solvers_dyn) +target_link_libraries( + ThreeBusZipLoadJson GridKit::phasor_dynamics_components GridKit::solvers_dyn) install(TARGETS ThreeBusZipLoadJson RUNTIME DESTINATION ${_install_path}) gridkit_example_add_file(ThreeBusZipLoad.json) diff --git a/examples/PhasorDynamics/Tiny/TwoBus/Basic/CMakeLists.txt b/examples/PhasorDynamics/Tiny/TwoBus/Basic/CMakeLists.txt index 109771f62..0802c4fac 100644 --- a/examples/PhasorDynamics/Tiny/TwoBus/Basic/CMakeLists.txt +++ b/examples/PhasorDynamics/Tiny/TwoBus/Basic/CMakeLists.txt @@ -1,27 +1,27 @@ gridkit_example_current_install_path(_install_path) add_executable(TwoBusBasic TwoBusBasic.cpp) -target_link_libraries(TwoBusBasic - GridKit::phasor_dynamics_components - GridKit::solvers_dyn) +target_link_libraries( + TwoBusBasic GridKit::phasor_dynamics_components GridKit::solvers_dyn) install(TARGETS TwoBusBasic RUNTIME DESTINATION ${_install_path}) add_executable(TwoBusBasicJson TwoBusBasicJson.cpp) -target_link_libraries(TwoBusBasicJson - GridKit::phasor_dynamics_components - GridKit::solvers_dyn) +target_link_libraries( + TwoBusBasicJson GridKit::phasor_dynamics_components GridKit::solvers_dyn) install(TARGETS TwoBusBasicJson RUNTIME DESTINATION ${_install_path}) gridkit_example_add_file(TwoBusBasic.case.json) add_test(NAME TwoBusBasic COMMAND TwoBusBasic) -add_test(NAME TwoBusBasicJson - COMMAND TwoBusBasicJson ${CMAKE_CURRENT_BINARY_DIR}/TwoBusBasic.case.json) -add_test(NAME TwoBusBasicJson_no_arg - COMMAND TwoBusBasicJson - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME TwoBusBasicJson COMMAND TwoBusBasicJson ${CMAKE_CURRENT_BINARY_DIR}/TwoBusBasic.case.json) +add_test( + NAME TwoBusBasicJson_no_arg + COMMAND TwoBusBasicJson + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) gridkit_example_add_file(TwoBusBasic.solver.json) gridkit_example_add_file(TwoBusBasic.ref.csv) -add_test(NAME TwoBusBasic_using_app - COMMAND PDSim TwoBusBasic.solver.json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME TwoBusBasic_using_app + COMMAND PDSim TwoBusBasic.solver.json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Tiny/TwoBus/Gensal/CMakeLists.txt b/examples/PhasorDynamics/Tiny/TwoBus/Gensal/CMakeLists.txt index 65a0934e5..54b928a47 100644 --- a/examples/PhasorDynamics/Tiny/TwoBus/Gensal/CMakeLists.txt +++ b/examples/PhasorDynamics/Tiny/TwoBus/Gensal/CMakeLists.txt @@ -3,6 +3,7 @@ gridkit_example_current_install_path(_install_path) gridkit_example_add_file(Gensal.case.json) gridkit_example_add_file(Gensal.solver.json) gridkit_example_add_file(Gensal.ref.csv) -add_test(NAME TwoBusGensal - COMMAND PDSim Gensal.solver.json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME TwoBusGensal + COMMAND PDSim Gensal.solver.json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Tiny/TwoBus/Ieeet1/CMakeLists.txt b/examples/PhasorDynamics/Tiny/TwoBus/Ieeet1/CMakeLists.txt index 8e514ab8a..2dd697aa0 100644 --- a/examples/PhasorDynamics/Tiny/TwoBus/Ieeet1/CMakeLists.txt +++ b/examples/PhasorDynamics/Tiny/TwoBus/Ieeet1/CMakeLists.txt @@ -1,23 +1,26 @@ gridkit_example_current_install_path(_install_path) add_executable(TwoBusIeeet1 TwoBusIeeet1.cpp) -target_link_libraries(TwoBusIeeet1 - GridKit::phasor_dynamics_components - GridKit::phasor_dynamics_signal - GridKit::solvers_dyn) +target_link_libraries( + TwoBusIeeet1 + GridKit::phasor_dynamics_components + GridKit::phasor_dynamics_signal + GridKit::solvers_dyn) install(TARGETS TwoBusIeeet1 RUNTIME DESTINATION ${_install_path}) add_executable(TwoBusIeeet1Json TwoBusIeeet1Json.cpp) -target_link_libraries(TwoBusIeeet1Json - GridKit::phasor_dynamics_components - GridKit::phasor_dynamics_signal - GridKit::solvers_dyn) +target_link_libraries( + TwoBusIeeet1Json + GridKit::phasor_dynamics_components + GridKit::phasor_dynamics_signal + GridKit::solvers_dyn) install(TARGETS TwoBusIeeet1Json RUNTIME DESTINATION ${_install_path}) gridkit_example_add_file(TwoBusIeeet1.json) add_test(NAME TwoBusIeeet1 COMMAND TwoBusIeeet1) -add_test(NAME TwoBusIeeet1Json - COMMAND TwoBusIeeet1Json ${CMAKE_CURRENT_BINARY_DIR}/TwoBusIeeet1.json) -add_test(NAME TwoBusIeeet1Json_no_arg - COMMAND TwoBusIeeet1Json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME TwoBusIeeet1Json COMMAND TwoBusIeeet1Json ${CMAKE_CURRENT_BINARY_DIR}/TwoBusIeeet1.json) +add_test( + NAME TwoBusIeeet1Json_no_arg + COMMAND TwoBusIeeet1Json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PhasorDynamics/Tiny/TwoBus/Tgov1/CMakeLists.txt b/examples/PhasorDynamics/Tiny/TwoBus/Tgov1/CMakeLists.txt index c6c8008e4..840571261 100644 --- a/examples/PhasorDynamics/Tiny/TwoBus/Tgov1/CMakeLists.txt +++ b/examples/PhasorDynamics/Tiny/TwoBus/Tgov1/CMakeLists.txt @@ -1,23 +1,25 @@ gridkit_example_current_install_path(_install_path) add_executable(TwoBusTgov1 TwoBusTgov1.cpp) -target_link_libraries(TwoBusTgov1 - GridKit::phasor_dynamics_components - GridKit::phasor_dynamics_signal - GridKit::solvers_dyn) +target_link_libraries( + TwoBusTgov1 + GridKit::phasor_dynamics_components + GridKit::phasor_dynamics_signal + GridKit::solvers_dyn) install(TARGETS TwoBusTgov1 RUNTIME DESTINATION ${_install_path}) add_executable(TwoBusTgov1Json TwoBusTgov1Json.cpp) -target_link_libraries(TwoBusTgov1Json - GridKit::phasor_dynamics_components - GridKit::phasor_dynamics_signal - GridKit::solvers_dyn) +target_link_libraries( + TwoBusTgov1Json + GridKit::phasor_dynamics_components + GridKit::phasor_dynamics_signal + GridKit::solvers_dyn) install(TARGETS TwoBusTgov1Json RUNTIME DESTINATION ${_install_path}) gridkit_example_add_file(TwoBusTgov1.json) add_test(NAME TwoBusTgov1 COMMAND TwoBusTgov1) -add_test(NAME TwoBusTgov1Json - COMMAND TwoBusTgov1Json ${CMAKE_CURRENT_BINARY_DIR}/TwoBusTgov1.json) -add_test(NAME TwoBusTgov1Json_no_arg - COMMAND TwoBusTgov1Json - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test(NAME TwoBusTgov1Json COMMAND TwoBusTgov1Json ${CMAKE_CURRENT_BINARY_DIR}/TwoBusTgov1.json) +add_test( + NAME TwoBusTgov1Json_no_arg + COMMAND TwoBusTgov1Json + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/examples/PowerElectronics/DistributedGeneratorTest/CMakeLists.txt b/examples/PowerElectronics/DistributedGeneratorTest/CMakeLists.txt index 225dd73f7..27616bfcc 100644 --- a/examples/PowerElectronics/DistributedGeneratorTest/CMakeLists.txt +++ b/examples/PowerElectronics/DistributedGeneratorTest/CMakeLists.txt @@ -1,11 +1,9 @@ - - - - add_executable(dgtest DGTest.cpp) -target_link_libraries(dgtest GridKit::power_elec_disgen - GridKit::power_elec_microline - GridKit::power_elec_microload) - -add_test(NAME DistributedGeneratorTest COMMAND $) +target_link_libraries( + dgtest + GridKit::power_elec_disgen + GridKit::power_elec_microline + GridKit::power_elec_microload) + +add_test(NAME DistributedGeneratorTest COMMAND $) install(TARGETS dgtest RUNTIME DESTINATION bin) diff --git a/examples/PowerElectronics/Microgrid/CMakeLists.txt b/examples/PowerElectronics/Microgrid/CMakeLists.txt index 1c67f74f3..6eae26be3 100644 --- a/examples/PowerElectronics/Microgrid/CMakeLists.txt +++ b/examples/PowerElectronics/Microgrid/CMakeLists.txt @@ -1,13 +1,11 @@ - - - - add_executable(microgrid Microgrid.cpp) -target_link_libraries(microgrid GridKit::power_elec_disgen - GridKit::power_elec_microline - GridKit::power_elec_microload - GridKit::solvers_dyn - GridKit::power_elec_microbusdq) - -add_test(NAME Microgrid COMMAND $) +target_link_libraries( + microgrid + GridKit::power_elec_disgen + GridKit::power_elec_microline + GridKit::power_elec_microload + GridKit::solvers_dyn + GridKit::power_elec_microbusdq) + +add_test(NAME Microgrid COMMAND $) install(TARGETS microgrid RUNTIME DESTINATION bin) diff --git a/examples/PowerElectronics/RLCircuit/CMakeLists.txt b/examples/PowerElectronics/RLCircuit/CMakeLists.txt index 42ffce87f..3b30c6a9b 100644 --- a/examples/PowerElectronics/RLCircuit/CMakeLists.txt +++ b/examples/PowerElectronics/RLCircuit/CMakeLists.txt @@ -1,13 +1,11 @@ - - - - add_executable(rlcircuit RLCircuit.cpp) -target_link_libraries(rlcircuit GridKit::power_elec_capacitor - GridKit::power_elec_inductor - GridKit::power_elec_resistor - GridKit::power_elec_voltagesource - GridKit::solvers_dyn) - -add_test(NAME RLCircuit COMMAND $) +target_link_libraries( + rlcircuit + GridKit::power_elec_capacitor + GridKit::power_elec_inductor + GridKit::power_elec_resistor + GridKit::power_elec_voltagesource + GridKit::solvers_dyn) + +add_test(NAME RLCircuit COMMAND $) install(TARGETS rlcircuit RUNTIME DESTINATION bin) diff --git a/examples/PowerElectronics/ScaleMicrogrid/CMakeLists.txt b/examples/PowerElectronics/ScaleMicrogrid/CMakeLists.txt index aeea5f01c..0334a939b 100644 --- a/examples/PowerElectronics/ScaleMicrogrid/CMakeLists.txt +++ b/examples/PowerElectronics/ScaleMicrogrid/CMakeLists.txt @@ -1,20 +1,20 @@ - - - - add_executable(scalemicrogrid ScaleMicrogrid.cpp) add_executable(scalemicrogridarbitrary ScaleMicrogridArbitrary.cpp) -target_link_libraries(scalemicrogrid GridKit::power_elec_disgen - GridKit::power_elec_microline - GridKit::power_elec_microload - GridKit::solvers_dyn - GridKit::power_elec_microbusdq) +target_link_libraries( + scalemicrogrid + GridKit::power_elec_disgen + GridKit::power_elec_microline + GridKit::power_elec_microload + GridKit::solvers_dyn + GridKit::power_elec_microbusdq) + +target_link_libraries( + scalemicrogridarbitrary + GridKit::power_elec_disgen + GridKit::power_elec_microline + GridKit::power_elec_microload + GridKit::solvers_dyn + GridKit::power_elec_microbusdq) -target_link_libraries(scalemicrogridarbitrary GridKit::power_elec_disgen - GridKit::power_elec_microline - GridKit::power_elec_microload - GridKit::solvers_dyn - GridKit::power_elec_microbusdq) - -add_test(NAME ScaleMicrogrid COMMAND $) +add_test(NAME ScaleMicrogrid COMMAND $) install(TARGETS scalemicrogrid RUNTIME DESTINATION bin) diff --git a/examples/PowerFlow/Grid3Bus/CMakeLists.txt b/examples/PowerFlow/Grid3Bus/CMakeLists.txt index fe3230bf1..5d5148cb8 100644 --- a/examples/PowerFlow/Grid3Bus/CMakeLists.txt +++ b/examples/PowerFlow/Grid3Bus/CMakeLists.txt @@ -10,12 +10,14 @@ # install(TARGETS grid3bus RUNTIME DESTINATION bin) add_executable(grid3bus Grid3BusSys.cpp) -target_link_libraries(grid3bus GridKit::minigrid - GridKit::bus - GridKit::generator - GridKit::branch - GridKit::load - GridKit::solvers_steady) +target_link_libraries( + grid3bus + GridKit::minigrid + GridKit::bus + GridKit::generator + GridKit::branch + GridKit::load + GridKit::solvers_steady) install(TARGETS grid3bus RUNTIME DESTINATION bin) -add_test(NAME Grid3Bus COMMAND $) +add_test(NAME Grid3Bus COMMAND $) diff --git a/examples/PowerFlow/MatPowerTesting/CMakeLists.txt b/examples/PowerFlow/MatPowerTesting/CMakeLists.txt index 3d896869c..b18928201 100644 --- a/examples/PowerFlow/MatPowerTesting/CMakeLists.txt +++ b/examples/PowerFlow/MatPowerTesting/CMakeLists.txt @@ -1,17 +1,12 @@ - set(test_sources - test_parse_gen_row - test_parse_bus_row - test_parse_branch_row - test_parse_gencost_row - test_parse_matpower - ) + test_parse_gen_row + test_parse_bus_row + test_parse_branch_row + test_parse_gencost_row + test_parse_matpower) foreach(src ${test_sources}) add_executable(${src} ${src}.cpp) target_link_libraries(${src} PUBLIC GridKit::Utilities) - add_test( - NAME ${src} - COMMAND $ - ) + add_test(NAME ${src} COMMAND $) endforeach() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index dfd2c45ef..0ff28552c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,5 @@ if(NOT BUILD_TESTING) - return() + return() endif() add_subdirectory(UnitTests) diff --git a/tests/UnitTests/AutomaticDifferentiation/CMakeLists.txt b/tests/UnitTests/AutomaticDifferentiation/CMakeLists.txt index 416ffde95..d8d3840a0 100644 --- a/tests/UnitTests/AutomaticDifferentiation/CMakeLists.txt +++ b/tests/UnitTests/AutomaticDifferentiation/CMakeLists.txt @@ -1,2 +1 @@ - add_subdirectory(DependencyTracking) diff --git a/tests/UnitTests/AutomaticDifferentiation/DependencyTracking/CMakeLists.txt b/tests/UnitTests/AutomaticDifferentiation/DependencyTracking/CMakeLists.txt index d6fd02f8d..2beb55e0a 100644 --- a/tests/UnitTests/AutomaticDifferentiation/DependencyTracking/CMakeLists.txt +++ b/tests/UnitTests/AutomaticDifferentiation/DependencyTracking/CMakeLists.txt @@ -3,14 +3,10 @@ # - Slaven Peles #]] - add_executable(test_dependency_tracking runDependencyTrackingTests.cpp) -target_link_libraries(test_dependency_tracking - GridKit::phasor_dynamics_bus - GridKit::testing) - +target_link_libraries( + test_dependency_tracking GridKit::phasor_dynamics_bus GridKit::testing) add_test(NAME DependencyTrackingTest COMMAND $) -install(TARGETS test_dependency_tracking - RUNTIME DESTINATION bin) +install(TARGETS test_dependency_tracking RUNTIME DESTINATION bin) diff --git a/tests/UnitTests/LinearAlgebra/SparseMatrix/CMakeLists.txt b/tests/UnitTests/LinearAlgebra/SparseMatrix/CMakeLists.txt index 97e0e0868..a7075f92f 100644 --- a/tests/UnitTests/LinearAlgebra/SparseMatrix/CMakeLists.txt +++ b/tests/UnitTests/LinearAlgebra/SparseMatrix/CMakeLists.txt @@ -1,12 +1,13 @@ add_executable(test_sparse_csr runSparseCsrTests.cpp) -target_link_libraries(test_sparse_csr GridKit::sparse_matrix GridKit::testing) +target_link_libraries( + test_sparse_csr GridKit::sparse_matrix GridKit::testing) add_test(NAME SparseTest COMMAND $) add_executable(test_sparse_coo runSparseCooTests.cpp) -target_link_libraries(test_sparse_coo GridKit::sparse_matrix GridKit::testing) +target_link_libraries( + test_sparse_coo GridKit::sparse_matrix GridKit::testing) add_test(NAME SparseCooTest COMMAND $) -install(TARGETS test_sparse_csr test_sparse_coo - RUNTIME DESTINATION bin) +install(TARGETS test_sparse_csr test_sparse_coo RUNTIME DESTINATION bin) diff --git a/tests/UnitTests/Math/CMakeLists.txt b/tests/UnitTests/Math/CMakeLists.txt index b3329f973..258144e27 100644 --- a/tests/UnitTests/Math/CMakeLists.txt +++ b/tests/UnitTests/Math/CMakeLists.txt @@ -1,7 +1,7 @@ add_executable(test_math_smoothness_indicator runSmoothnessIndicatorTests.cpp) -target_link_libraries(test_math_smoothness_indicator PRIVATE - GridKit::definitions - GridKit::testing) +target_link_libraries( + test_math_smoothness_indicator + PRIVATE GridKit::definitions GridKit::testing) add_test(NAME MathSmoothnessIndicatorTest COMMAND test_math_smoothness_indicator) diff --git a/tests/UnitTests/PhasorDynamics/CMakeLists.txt b/tests/UnitTests/PhasorDynamics/CMakeLists.txt index 8c7df4892..94e17ce5d 100644 --- a/tests/UnitTests/PhasorDynamics/CMakeLists.txt +++ b/tests/UnitTests/PhasorDynamics/CMakeLists.txt @@ -3,102 +3,123 @@ # - Slaven Peles #]] - add_executable(test_phasor_bus runBusTests.cpp) -target_link_libraries(test_phasor_bus GridKit::phasor_dynamics_bus - GridKit::testing) +target_link_libraries( + test_phasor_bus GridKit::phasor_dynamics_bus GridKit::testing) add_executable(test_phasor_branch runBranchTests.cpp) -target_link_libraries(test_phasor_branch GridKit::phasor_dynamics_branch - GridKit::phasor_dynamics_branch_dependency_tracking - GridKit::phasor_dynamics_bus - GridKit::phasor_dynamics_bus_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_branch + GridKit::phasor_dynamics_branch + GridKit::phasor_dynamics_branch_dependency_tracking + GridKit::phasor_dynamics_bus + GridKit::phasor_dynamics_bus_dependency_tracking + GridKit::testing) add_executable(test_phasor_load runLoadTests.cpp) -target_link_libraries(test_phasor_load GridKit::definitions - GridKit::phasor_dynamics_load - GridKit::phasor_dynamics_load_dependency_tracking - GridKit::phasor_dynamics_bus - GridKit::phasor_dynamics_bus_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_load + GridKit::definitions + GridKit::phasor_dynamics_load + GridKit::phasor_dynamics_load_dependency_tracking + GridKit::phasor_dynamics_bus + GridKit::phasor_dynamics_bus_dependency_tracking + GridKit::testing) add_executable(test_phasor_loadzip runLoadZIPTests.cpp) -target_link_libraries(test_phasor_loadzip GridKit::definitions - GridKit::phasor_dynamics_loadzip - GridKit::phasor_dynamics_loadzip_dependency_tracking - GridKit::phasor_dynamics_bus - GridKit::phasor_dynamics_bus_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_loadzip + GridKit::definitions + GridKit::phasor_dynamics_loadzip + GridKit::phasor_dynamics_loadzip_dependency_tracking + GridKit::phasor_dynamics_bus + GridKit::phasor_dynamics_bus_dependency_tracking + GridKit::testing) add_executable(test_phasor_genrou runGenrouTests.cpp) -target_link_libraries(test_phasor_genrou GridKit::definitions - GridKit::phasor_dynamics_genrou - GridKit::phasor_dynamics_genrou_dependency_tracking - GridKit::phasor_dynamics_bus - GridKit::phasor_dynamics_bus_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_genrou + GridKit::definitions + GridKit::phasor_dynamics_genrou + GridKit::phasor_dynamics_genrou_dependency_tracking + GridKit::phasor_dynamics_bus + GridKit::phasor_dynamics_bus_dependency_tracking + GridKit::testing) add_executable(test_phasor_gensal runGensalTests.cpp) -target_link_libraries(test_phasor_gensal GridKit::definitions - GridKit::phasor_dynamics_gensal - GridKit::phasor_dynamics_gensal_dependency_tracking - GridKit::phasor_dynamics_bus - GridKit::phasor_dynamics_bus_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_gensal + GridKit::definitions + GridKit::phasor_dynamics_gensal + GridKit::phasor_dynamics_gensal_dependency_tracking + GridKit::phasor_dynamics_bus + GridKit::phasor_dynamics_bus_dependency_tracking + GridKit::testing) add_executable(test_phasor_governor_tgov1 runGovernorTgov1Tests.cpp) -target_link_libraries(test_phasor_governor_tgov1 GridKit::definitions - GridKit::phasor_dynamics_genrou - GridKit::phasor_dynamics_genrou_dependency_tracking - GridKit::phasor_dynamics_governor_tgov1 - GridKit::phasor_dynamics_governor_tgov1_dependency_tracking - GridKit::phasor_dynamics_signal - GridKit::phasor_dynamics_bus - GridKit::phasor_dynamics_bus_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_governor_tgov1 + GridKit::definitions + GridKit::phasor_dynamics_genrou + GridKit::phasor_dynamics_genrou_dependency_tracking + GridKit::phasor_dynamics_governor_tgov1 + GridKit::phasor_dynamics_governor_tgov1_dependency_tracking + GridKit::phasor_dynamics_signal + GridKit::phasor_dynamics_bus + GridKit::phasor_dynamics_bus_dependency_tracking + GridKit::testing) add_executable(test_phasor_exciter_ieeet1 runExciterIeeet1Tests.cpp) -target_link_libraries(test_phasor_exciter_ieeet1 GridKit::definitions - GridKit::phasor_dynamics_components - GridKit::phasor_dynamics_components_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_exciter_ieeet1 + GridKit::definitions + GridKit::phasor_dynamics_components + GridKit::phasor_dynamics_components_dependency_tracking + GridKit::testing) add_executable(test_phasor_exciter_sexspti runExciterSexsPtiTests.cpp) -target_link_libraries(test_phasor_exciter_sexspti GridKit::definitions - GridKit::phasor_dynamics_components - GridKit::phasor_dynamics_components_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_exciter_sexspti + GridKit::definitions + GridKit::phasor_dynamics_components + GridKit::phasor_dynamics_components_dependency_tracking + GridKit::testing) add_executable(test_phasor_stabilizer_ieeest runStabilizerIeeestTests.cpp) -target_link_libraries(test_phasor_stabilizer_ieeest GridKit::definitions - GridKit::phasor_dynamics_stabilizer_ieeest - GridKit::phasor_dynamics_stabilizer_ieeest_dependency_tracking - GridKit::phasor_dynamics_signal - GridKit::testing) +target_link_libraries( + test_phasor_stabilizer_ieeest + GridKit::definitions + GridKit::phasor_dynamics_stabilizer_ieeest + GridKit::phasor_dynamics_stabilizer_ieeest_dependency_tracking + GridKit::phasor_dynamics_signal + GridKit::testing) add_executable(test_phasor_gen_classical runGenClassicalTests.cpp) -target_link_libraries(test_phasor_gen_classical GridKit::definitions - GridKit::phasor_dynamics_gen_classical - GridKit::phasor_dynamics_gen_classical_dependency_tracking - GridKit::phasor_dynamics_bus - GridKit::phasor_dynamics_bus_dependency_tracking - GridKit::testing) - +target_link_libraries( + test_phasor_gen_classical + GridKit::definitions + GridKit::phasor_dynamics_gen_classical + GridKit::phasor_dynamics_gen_classical_dependency_tracking + GridKit::phasor_dynamics_bus + GridKit::phasor_dynamics_bus_dependency_tracking + GridKit::testing) add_executable(test_phasor_system runSystemTests.cpp) -target_link_libraries(test_phasor_system GridKit::definitions - GridKit::phasor_dynamics_components - GridKit::phasor_dynamics_components_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_system + GridKit::definitions + GridKit::phasor_dynamics_components + GridKit::phasor_dynamics_components_dependency_tracking + GridKit::testing) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ThreeBusBasicBad.json - ${CMAKE_CURRENT_BINARY_DIR}/ThreeBusBasicBad.json - COPYONLY) + ${CMAKE_CURRENT_BINARY_DIR}/ThreeBusBasicBad.json COPYONLY) add_executable(test_phasor_system_single_component runSystemSingleComponentTests.cpp) -target_link_libraries(test_phasor_system_single_component GridKit::phasor_dynamics_components - GridKit::phasor_dynamics_components_dependency_tracking - GridKit::testing) +target_link_libraries( + test_phasor_system_single_component + GridKit::phasor_dynamics_components + GridKit::phasor_dynamics_components_dependency_tracking + GridKit::testing) add_test(NAME PhasorDynamicsBusTest COMMAND test_phasor_bus) add_test(NAME PhasorDynamicsBranchTest COMMAND test_phasor_branch) @@ -111,21 +132,24 @@ add_test(NAME PhasorDynamicsStabilizerIeeestTest COMMAND test_phasor_stabilizer_ add_test(NAME PhasorDynamicsGenClassicalTest COMMAND test_phasor_gen_classical) add_test(NAME PhasorDynamicsLoadTest COMMAND test_phasor_load) add_test(NAME PhasorDynamicsLoadZIPTest COMMAND test_phasor_loadzip) -add_test(NAME PhasorDynamicsSystemTest COMMAND test_phasor_system - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +add_test( + NAME PhasorDynamicsSystemTest + COMMAND test_phasor_system + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) add_test(NAME PhasorDynamicsSystemSingleComponentTest COMMAND test_phasor_system_single_component) -install(TARGETS test_phasor_bus - test_phasor_branch - test_phasor_load - test_phasor_loadzip - test_phasor_genrou - test_phasor_governor_tgov1 - test_phasor_exciter_ieeet1 - test_phasor_gensal - test_phasor_exciter_sexspti - test_phasor_stabilizer_ieeest - test_phasor_gen_classical - test_phasor_system - test_phasor_system_single_component - RUNTIME DESTINATION bin) +install( + TARGETS test_phasor_bus + test_phasor_branch + test_phasor_load + test_phasor_loadzip + test_phasor_genrou + test_phasor_governor_tgov1 + test_phasor_exciter_ieeet1 + test_phasor_gensal + test_phasor_exciter_sexspti + test_phasor_stabilizer_ieeest + test_phasor_gen_classical + test_phasor_system + test_phasor_system_single_component + RUNTIME DESTINATION bin) diff --git a/tests/UnitTests/PowerElectronics/CMakeLists.txt b/tests/UnitTests/PowerElectronics/CMakeLists.txt index 14720e461..74d50eb1e 100644 --- a/tests/UnitTests/PowerElectronics/CMakeLists.txt +++ b/tests/UnitTests/PowerElectronics/CMakeLists.txt @@ -1,9 +1,8 @@ add_executable(test_power_electronics_node runCircuitNodeTests.cpp) -target_link_libraries(test_power_electronics_node PRIVATE - GridKit::power_electronics_circuit_node - GridKit::testing) +target_link_libraries( + test_power_electronics_node + PRIVATE GridKit::power_electronics_circuit_node GridKit::testing) add_test(NAME PowerElectronicsNodeTest COMMAND $) -install(TARGETS test_power_electronics_node - RUNTIME DESTINATION bin) +install(TARGETS test_power_electronics_node RUNTIME DESTINATION bin) diff --git a/tests/UnitTests/Solver/CMakeLists.txt b/tests/UnitTests/Solver/CMakeLists.txt index 56e6344f7..b6a9ff80a 100644 --- a/tests/UnitTests/Solver/CMakeLists.txt +++ b/tests/UnitTests/Solver/CMakeLists.txt @@ -4,5 +4,5 @@ #]] if(TARGET SUNDIALS::idas) - add_subdirectory(Dynamic) + add_subdirectory(Dynamic) endif() diff --git a/tests/UnitTests/Solver/Dynamic/CMakeLists.txt b/tests/UnitTests/Solver/Dynamic/CMakeLists.txt index 11e21839d..b6ed121e8 100644 --- a/tests/UnitTests/Solver/Dynamic/CMakeLists.txt +++ b/tests/UnitTests/Solver/Dynamic/CMakeLists.txt @@ -1,10 +1,9 @@ -# +# add_executable(test_ida runIdaTests.cpp) -target_link_libraries(test_ida GridKit::solvers_dyn GridKit::testing) - +target_link_libraries( + test_ida GridKit::solvers_dyn GridKit::testing) # add_test(NAME IDATest COMMAND $) -install(TARGETS test_ida - RUNTIME DESTINATION bin) +install(TARGETS test_ida RUNTIME DESTINATION bin) diff --git a/tests/UnitTests/Utilities/CMakeLists.txt b/tests/UnitTests/Utilities/CMakeLists.txt index 3075c04dd..9b2202d39 100644 --- a/tests/UnitTests/Utilities/CMakeLists.txt +++ b/tests/UnitTests/Utilities/CMakeLists.txt @@ -1,21 +1,20 @@ add_executable(test_case_format runCaseFormatTests.cpp) -target_link_libraries(test_case_format PRIVATE - GridKit::phasor_dynamics_components - GridKit::testing) -target_include_directories(test_case_format - PRIVATE - ${GRIDKIT_THIRD_PARTY_DIR}/nlohmann-json/single_include - ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) +target_link_libraries( + test_case_format + PRIVATE GridKit::phasor_dynamics_components GridKit::testing) +target_include_directories( + test_case_format + PRIVATE ${GRIDKIT_THIRD_PARTY_DIR}/nlohmann-json/single_include + ${GRIDKIT_THIRD_PARTY_DIR}/magic-enum/include) add_executable(test_logger runLoggerTests.cpp) -target_link_libraries(test_logger PRIVATE - GridKit::utilities_logger - GridKit::testing) +target_link_libraries( + test_logger + PRIVATE GridKit::utilities_logger GridKit::testing) add_executable(test_cli_args runCliArgsTests.cpp) -target_link_libraries(test_cli_args PRIVATE - GridKit::utilities_cli_args - GridKit::utilities_logger - GridKit::testing) +target_link_libraries( + test_cli_args + PRIVATE GridKit::utilities_cli_args GridKit::utilities_logger GridKit::testing) add_test(NAME UtilitiesCaseFormatTest COMMAND test_case_format) add_test(NAME UtilitiesLoggerTest COMMAND test_logger)