Skip to content

feat/separate loader #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbowman-mitre merged 7 commits into from
Jun 8, 2026
Merged

feat/separate loader #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
33a3f3c
chore: switch over to external repo for cppuom
sbowman-mitre Jun 8, 2026
ee27d97
chore: fully remove old cppuom local source
sbowman-mitre Jun 8, 2026
4e3e31f
chore: move header around a bit
sbowman-mitre Jun 8, 2026
b50b2e7
chore: make the loader code not depend on CustomUnits.h
sbowman-mitre Jun 8, 2026
3b1e63b
refactor: now using mitre::fsloader dependency; removed loader code
sbowman-mitre Jun 8, 2026
25d1975
chore: added a convenience Makefile
sbowman-mitre Jun 8, 2026
9a13bbb
chore: now using fsloader 1.0.0
sbowman-mitre Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .cmake/aaesim-config.cmake.in
View file
Open in desktop

This file was deleted.

328 changes: 0 additions & 328 deletions .cmake/aaesim.cmake
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ latex/*
cmake_install.cmake
CMakeFiles
CMakeCache.txt
Makefile
*/baseline/*.html
*.so
*.png
Expand Down
7 changes: 4 additions & 3 deletions AircraftDynamicsTestFramework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,13 @@ include(sample_algorithm_library.cmake OPTIONAL)
add_library(framework STATIC ${SOURCE_FILES} ${DATA_READER_FILES} ${DATA_LOADER_FILES} ${DATA_WRITER_FILES})
target_include_directories(framework PUBLIC
${aaesim_INCLUDE_DIRS}
${geolib_idealab_INCLUDE_DIRS}
${LOG4CPLUS_DIRS})
${geolib_idealab_INCLUDE_DIRS})
target_link_libraries(framework
PUBLIC
mitre::fsloader
${BADA_LIBRARY}
${SAMPLE_ALGORITHM_LIBRARY}
log4cplusS
log4cplus::log4cplus
pub)
if (DEFINED BADA_LIBRARY)
# Add a compile definition to the build
Expand Down
3 changes: 1 addition & 2 deletions AircraftDynamicsTestFramework/framework.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@ if(NOT ${BUILD_LIBARIES_ONLY})
$<BUILD_INTERFACE:${cppmanifest_INCLUDE_DIR}>
$<BUILD_INTERFACE:${aaesim_INCLUDE_DIRS}>
$<BUILD_INTERFACE:${minicsv_INCLUDE_DIR}>
${LOG4CPLUS_DIRS}
)
set_target_properties(FMACM PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin
)
else()
# Ensure framework library is a build target even though nothing depends on it
set_target_properties(framework PROPERTIES EXCLUDE_FROM_ALL FALSE)
endif()
endif()
Loading
Loading