-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
43 changed files
with
266 additions
and
268 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,146 +1,5 @@ | ||
|
|
||
| add_subdirectory(util) | ||
| add_subdirectory(ecos) | ||
| add_subdirectory(proxyfmu) | ||
|
|
||
| set(publicHeaders | ||
|
|
||
| "ecos/connection.hpp" | ||
| "ecos/lib_info.hpp" | ||
| "ecos/model.hpp" | ||
| "ecos/model_instance.hpp" | ||
| "ecos/model_resolver.hpp" | ||
| "ecos/property.hpp" | ||
| "ecos/scalar.hpp" | ||
| "ecos/scenario.hpp" | ||
| "ecos/scenario_loader.hpp" | ||
| "ecos/simulation.hpp" | ||
| "ecos/simulation_runner.hpp" | ||
| "ecos/variable_identifier.hpp" | ||
|
|
||
| "ecos/algorithm/algorithm.hpp" | ||
| "ecos/algorithm/fixed_step_algorithm.hpp" | ||
|
|
||
| "ecos/listeners/simulation_listener.hpp" | ||
| "ecos/listeners/csv_writer.hpp" | ||
|
|
||
| "ecos/logger/logger.hpp" | ||
|
|
||
| "ecos/structure/simulation_structure.hpp" | ||
|
|
||
| "ssp/ssp_parser.hpp" | ||
|
|
||
| ) | ||
|
|
||
| set(publicHeadersFull) | ||
| foreach (header IN LISTS commonPublicHeaders) | ||
| list(APPEND commonPublicHeadersFull "${PROJECT_SOURCE_DIR}/include/${header}") | ||
| endforeach () | ||
|
|
||
| set(privateHeaders | ||
|
|
||
| "ecos/fmi/fmi_model.hpp" | ||
| "ecos/fmi/fmi_model_instance.hpp" | ||
| "ecos/fmi/fmi_model_sub_resolver.hpp" | ||
| "ecos/fmi/proxy/proxy_fmu.hpp" | ||
| "ecos/fmi/proxy/proxy_slave.hpp" | ||
| "ecos/fmi/proxy/proxy_model.hpp" | ||
| "ecos/fmi/proxy/proxy_model_sub_resolver.hpp" | ||
|
|
||
| "ecos/fmi/fmu.hpp" | ||
| "ecos/fmi/fmi1/fmi1_fmu.hpp" | ||
| "ecos/fmi/fmi1/fmi1_slave.hpp" | ||
| "ecos/fmi/fmi1/fmi1_model_description.hpp" | ||
| "ecos/fmi/fmi2/fmi2_fmu.hpp" | ||
| "ecos/fmi/fmi2/fmi2_slave.hpp" | ||
| "ecos/fmi/fmi2/fmi2_model_description.hpp" | ||
|
|
||
| "ecos/ssp/ssp.hpp" | ||
|
|
||
| "ecos/util/temp_dir.hpp" | ||
| "ecos/util/unzipper.hpp" | ||
| "ecos/util/uuid.hpp" | ||
|
|
||
| ) | ||
|
|
||
| set(sources | ||
|
|
||
| "ecos/logger.cpp" | ||
| "ecos/model_resolver.cpp" | ||
| "ecos/simulation.cpp" | ||
| "ecos/simulation_runner.cpp" | ||
|
|
||
| "ecos/scenario/scenario.cpp" | ||
| "ecos/scenario/scenario_loader_xml.cpp" | ||
|
|
||
| "ecos/algorithm/fixed_step_algorithm.cpp" | ||
|
|
||
| "ecos/fmi/fmu.cpp" | ||
| "ecos/fmi/fmi1/fmi1_fmu.cpp" | ||
| "ecos/fmi/fmi1/fmi1_slave.cpp" | ||
| "ecos/fmi/fmi1/fmi1_model_description.cpp" | ||
| "ecos/fmi/fmi2/fmi2_fmu.cpp" | ||
| "ecos/fmi/fmi2/fmi2_slave.cpp" | ||
| "ecos/fmi/fmi2/fmi2_model_description.cpp" | ||
| "ecos/fmi/fmi_model_sub_resolver.cpp" | ||
|
|
||
| "ecos/fmi/proxy/proxy_model_sub_resolver.cpp" | ||
| "ecos/fmi/proxy/proxy_fmu.cpp" | ||
| "ecos/fmi/proxy/proxy_slave.cpp" | ||
|
|
||
| "ecos/listeners/csv_writer.cpp" | ||
| "ecos/listeners/simulation_listener.cpp" | ||
|
|
||
| "ecos/ssp/ssp.cpp" | ||
| "ecos/ssp/ssp_loader.cpp" | ||
|
|
||
| "ecos/structure/simulation_structure.cpp" | ||
|
|
||
| "ecos/util/temp_dir.cpp" | ||
| "ecos/util/unzipper.cpp" | ||
| "ecos/util/uuid.cpp" | ||
|
|
||
| ) | ||
|
|
||
| # Generate sources from .in files | ||
| set(generatedFiles "${generatedSourcesDir}/ecos/lib_info.cpp") | ||
| configure_file( | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/ecos/lib_info.cpp.in" | ||
| "${generatedFiles}" | ||
| @ONLY | ||
| ) | ||
|
|
||
| add_library(libecos ${publicHeadersFull} ${publicHeadersFull} ${privateHeaders} ${sources} ${generatedFiles} "$<TARGET_OBJECTS:proxyfmu-service>") | ||
| set_property(TARGET libecos PROPERTY POSITION_INDEPENDENT_CODE ON) | ||
| target_compile_features(libecos PUBLIC "cxx_std_17") | ||
| target_include_directories(libecos | ||
| PUBLIC | ||
| "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>" | ||
| "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" | ||
| PRIVATE | ||
| "${generatedSourcesDir}" | ||
| "${SUBPROCESS_INCLUDE_DIR}" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}" | ||
| ) | ||
| target_link_libraries(libecos | ||
| PUBLIC | ||
| fmt::fmt | ||
| PRIVATE | ||
| libzip::zip | ||
| spdlog::spdlog | ||
| thrift::thrift | ||
| pugixml::pugixml | ||
| unofficial::fmilib::fmilib | ||
| ) | ||
| if (UNIX) | ||
| target_link_libraries(libecos INTERFACE stdc++fs tbb) | ||
| endif () | ||
|
|
||
| if (ECOS_BUILD_CLIB) | ||
| add_library(libecosc SHARED "${CMAKE_CURRENT_SOURCE_DIR}/ecos/ecos.cpp") | ||
| set_property(TARGET libecosc PROPERTY POSITION_INDEPENDENT_CODE ON) | ||
| target_link_libraries(libecosc | ||
| PUBLIC | ||
| libecos) | ||
| endif () | ||
|
|
||
| # Make sure executable is up to date | ||
| #add_dependencies(libecos proxyfmu) | ||
| add_subdirectory(fmilibcpp) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
|
|
||
| set(publicHeaders | ||
|
|
||
| "connection.hpp" | ||
| "lib_info.hpp" | ||
| "model.hpp" | ||
| "model_instance.hpp" | ||
| "model_resolver.hpp" | ||
| "property.hpp" | ||
| "scalar.hpp" | ||
| "scenario.hpp" | ||
| "scenario_loader.hpp" | ||
| "simulation.hpp" | ||
| "simulation_runner.hpp" | ||
| "variable_identifier.hpp" | ||
|
|
||
| "algorithm/algorithm.hpp" | ||
| "algorithm/fixed_step_algorithm.hpp" | ||
|
|
||
| "listeners/simulation_listener.hpp" | ||
| "listeners/csv_writer.hpp" | ||
|
|
||
| "logger/logger.hpp" | ||
|
|
||
| "structure/simulation_structure.hpp" | ||
|
|
||
| "ssp/ssp_loader.hpp" | ||
|
|
||
| ) | ||
|
|
||
| set(publicHeadersFull) | ||
| foreach (header IN LISTS commonPublicHeaders) | ||
| list(APPEND commonPublicHeadersFull "${PROJECT_SOURCE_DIR}/include/ecos/${header}") | ||
| endforeach () | ||
|
|
||
| set(privateHeaders | ||
|
|
||
| "fmi/fmi_model.hpp" | ||
| "fmi/fmi_model_instance.hpp" | ||
| "fmi/fmi_model_sub_resolver.hpp" | ||
|
|
||
| "fmi/proxy/proxy_model.hpp" | ||
| "fmi/proxy/proxy_model_sub_resolver.hpp" | ||
|
|
||
| "ssp/ssp.hpp" | ||
|
|
||
| ) | ||
|
|
||
| set(sources | ||
|
|
||
| "model_resolver.cpp" | ||
| "simulation.cpp" | ||
| "simulation_runner.cpp" | ||
|
|
||
| "scenario/scenario.cpp" | ||
| "scenario/scenario_loader_xml.cpp" | ||
|
|
||
| "algorithm/fixed_step_algorithm.cpp" | ||
|
|
||
| "fmi/fmi_model_sub_resolver.cpp" | ||
|
|
||
| "fmi/proxy/proxy_model_sub_resolver.cpp" | ||
|
|
||
| "listeners/csv_writer.cpp" | ||
| "listeners/simulation_listener.cpp" | ||
|
|
||
| "ssp/ssp.cpp" | ||
| "ssp/ssp_loader.cpp" | ||
|
|
||
| "structure/simulation_structure.cpp" | ||
|
|
||
| ) | ||
|
|
||
| # Generate sources from .in files | ||
| set(generatedFiles "${generatedSourcesDir}/ecos/lib_info.cpp") | ||
| configure_file( | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/lib_info.cpp.in" | ||
| "${generatedFiles}" | ||
| @ONLY | ||
| ) | ||
|
|
||
| add_library(libecos ${publicHeadersFull} ${privateHeaders} ${sources} ${generatedFiles} "$<TARGET_OBJECTS:proxyfmu-client>") | ||
| set_property(TARGET libecos PROPERTY POSITION_INDEPENDENT_CODE ON) | ||
| target_compile_features(libecos PUBLIC "cxx_std_17") | ||
| target_include_directories(libecos | ||
| PUBLIC | ||
| "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>" | ||
| "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" | ||
| PRIVATE | ||
| "${generatedSourcesDir}" | ||
| "${SUBPROCESS_INCLUDE_DIR}" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/.." | ||
| ) | ||
| target_link_libraries(libecos | ||
| PRIVATE | ||
| pugixml::pugixml | ||
| ) | ||
| if (UNIX) | ||
| target_link_libraries(libecos INTERFACE stdc++fs tbb) | ||
| endif () | ||
|
|
||
| if (ECOS_BUILD_CLIB) | ||
| add_library(libecosc SHARED "${CMAKE_CURRENT_SOURCE_DIR}/ecos.cpp") | ||
| set_property(TARGET libecosc PROPERTY POSITION_INDEPENDENT_CODE ON) | ||
| target_link_libraries(libecosc | ||
| PUBLIC | ||
| libecos) | ||
| endif () | ||
|
|
||
| # Make sure executable is up to date | ||
| #add_dependencies(libecos proxyfmu) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
|
|
||
| set(sources | ||
|
|
||
| "fmu.cpp" | ||
| "fmi1/fmi1_fmu.cpp" | ||
| "fmi1/fmi1_slave.cpp" | ||
| "fmi1/fmi1_model_description.cpp" | ||
| "fmi2/fmi2_fmu.cpp" | ||
| "fmi2/fmi2_slave.cpp" | ||
| "fmi2/fmi2_model_description.cpp" | ||
|
|
||
| ) | ||
|
|
||
| add_library(fmilibcpp OBJECT ${sources} "$<TARGET_OBJECTS:ecos-utils>") | ||
| target_link_libraries(fmilibcpp PRIVATE unofficial::fmilib::fmilib) | ||
| target_include_directories(fmilibcpp PRIVATE "${PROJECT_SOURCE_DIR}/include" "${PROJECT_SOURCE_DIR}/src") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.