Skip to content

chore: cmake updates #43

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 1 commit into from
Jun 30, 2026
Merged

chore: cmake updates #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion AircraftDynamicsTestFramework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.29)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
Expand Down
13 changes: 4 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(aaesim VERSION 5.3.3)
cmake_minimum_required(VERSION 3.29)
project(fmacm VERSION 5.3.4 LANGUAGES CXX)

set (CMAKE_CXX_STANDARD 20)

Expand Down Expand Up @@ -50,12 +50,7 @@ CPMAddPackage(
VERSION 1.2.5
)

# Append -SNAPSHOT to the version name if this is a pre-release version
if(PROJECT_VERSION_TWEAK)
set(FMACM_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-SNAPSHOT)
else()
set(FMACM_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
endif()
set(FMACM_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
message("-- Generating build for ${PROJECT_NAME} version ${FMACM_VERSION}")

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
Expand All @@ -77,7 +72,7 @@ if(NOT TARGET mitre::oss::simcore)
CPMAddPackage(
NAME aircraft_simulation_core
GIT_REPOSITORY https://github.com/mitre/aircraft_simulation_core.git
GIT_TAG a84dc78805bf35b6a45c68ac99f1c47fe47ad892 # FIXME switch to a release tag when available
GIT_TAG 1.0.0
OPTIONS
"SIMCORE_BUILD_TESTING OFF"
)
Expand Down
Loading