Skip to content

Fix F' config include path #696

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
merged 2 commits into from
May 13, 2025
Merged

Fix F' config include path #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e95e56
Fix F' config include path
Brian-Campuzano May 13, 2025
7f953ba
Revise compilation script
bocchino May 13, 2025
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
4 changes: 2 additions & 2 deletions compiler/scripts/fprime-gcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ======================================================================
# Compile F Prime source files
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
# Setup:
#
# 1. Set FPRIME to point to the root of your F Prime working repo
Expand Down Expand Up @@ -48,7 +48,7 @@ g++ --std=c++11 \
$os_flags \
-DTGT_OS_TYPE_$os_type \
-I $FPRIME \
-I $FPRIME/config \
-I $FPRIME/default \
-I $FPRIME/cmake/platform/types \
-I . \
$FPRIME_GCC_FLAGS \
Expand Down
4 changes: 2 additions & 2 deletions compiler/tools/fpp-to-cpp/test/component/compile_base_cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Compile base class C++ files with guards for conditional compilation
#
# By default, each file is compiled with three different sets of values of F
# Prime guards:
# Prime guards:
# - Default values as found in fprime/config/FpConfig.h
# - All guards turned on
# - All guards turned off (except FW_PORT_SERIALIZATION for components
Expand All @@ -29,7 +29,7 @@ done
fprime_gcc=../../../../../scripts/fprime-gcc

# Set compiler flags
include_flags="-I.. -I../.. -I../../fprime -I../../fprime/config"
include_flags="-I.. -I../.. -I../../fprime"
# F Prime components sometimes provide parameter arguments that are unused
# F Prime components use variable-length arrays for managing buffers
warning_flags="
Expand Down