Skip to content

Commit

Permalink
Issue nasa#24: Add _custom suffix to extension files
Browse files Browse the repository at this point in the history
Add a _custom suffix to differentiate the customization
file from the base file in the cmake directory.
  • Loading branch information
jphickey committed Jan 9, 2020
1 parent ebd356b commit 7a2f49b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ read_targetconfig()
# The custom script may override functions such as the
# cfe_exec_do_install() and cfe_app_do_install() functions for this
if (IS_CFS_ARCH_BUILD)
include("${MISSION_DEFS}/arch_build.cmake" OPTIONAL)
include("${MISSION_DEFS}/arch_build_${TARGETSYSTEM}.cmake" OPTIONAL)
include("${MISSION_DEFS}/arch_build_custom.cmake" OPTIONAL)
include("${MISSION_DEFS}/arch_build_custom_${TARGETSYSTEM}.cmake" OPTIONAL)
elseif (IS_CFS_MISSION_BUILD)
include("${MISSION_DEFS}/mission_build.cmake" OPTIONAL)
include("${MISSION_DEFS}/mission_build_custom.cmake" OPTIONAL)
endif (IS_CFS_ARCH_BUILD)

# Call the prepare function defined by the sub-script
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Example arch_build.cmake
# -------------------------
# Example arch_build_custom.cmake
# -------------------------------
#
# This file will be automatically included in the arch-specific build scope
#
Expand All @@ -19,7 +19,7 @@
# compiler from the same vendor and/or are all GCC based such that they accept similar
# command line options.
#
# This file can alternatively be named as "arch_build_${TARGETSYSTEM}.cmake"
# This file can alternatively be named as "arch_build_custom_${TARGETSYSTEM}.cmake"
# where ${TARGETSYSTEM} represents the system type, matching the toolchain.
#
# These example options assume a GCC-style toolchain is used for cross compilation,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Example mission_build.cmake
# ---------------------------
# Example mission_build_custom.cmake
# ----------------------------------
#
# This file will be automatically included in the top level ("mission") build scope
#
Expand Down

0 comments on commit 7a2f49b

Please sign in to comment.