Skip to content

Commit

Permalink
Merge pull request #1848 from jphickey/fix-1847-enable-strict-resourceid
Browse files Browse the repository at this point in the history
Fix #1847, enable strict resource id w/OMIT_DEPRECATED
  • Loading branch information
astrogeco authored Aug 20, 2021
2 parents 54612f1 + 823d772 commit 82deffb
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cmake/sample_defs/global_build_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ set(OMIT_DEPRECATED $ENV{OMIT_DEPRECATED} CACHE STRING "Omit deprecated elements
if (OMIT_DEPRECATED)
message (STATUS "OMIT_DEPRECATED=true: Not including deprecated elements in build")
add_definitions(-DCFE_OMIT_DEPRECATED_6_8 -DCFE_OMIT_DEPRECATED_6_7 -DCFE_OMIT_DEPRECATED_6_6 -DOSAL_OMIT_DEPRECATED)
set(MISSION_RESOURCEID_MODE "STRICT") # more type safe, but less backward compatible
else()
message (STATUS "OMIT_DEPRECATED=false: Deprecated elements included in build")
set(MISSION_RESOURCEID_MODE "SIMPLE") # less type safe, but more backward compatible
endif (OMIT_DEPRECATED)

0 comments on commit 82deffb

Please sign in to comment.