ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-24 15:26:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

1194 trick system icg exclude (#1195)

Browse Source 
* Fix ICG errors while processing system header files closes #1189

Found an InitPreprocessor call and am using it.  Not sure which version
of clang it was added, just using for the version I'm on (10) and above.
Also found some GCC defines that are used during normal compilation.
Added these to our list of defines during ICG.  This clears up all of
the errors I've been seeing.

* Fix ICG errors while processing system header files #1189

OK, found the flag that activates the ATOMIC defines I was previously
hardcoding.

* #1194 add trick-system-icg-exclude

Co-authored-by: Alex Lin <alexander.s.lin@nasa.gov>
This commit is contained in:
Scott Fennell 2021-10-12 12:02:03 -05:00 committed by GitHub
parent 9f9fd7ca20
commit 4a9d9482ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/trick/makefiles/Makefile.common
View File

@ -50,6 +50,7 @@ ifndef TRICK_LD
export TRICK_LD := $(LD) export TRICK_LD := $(LD)
endif endif
# setting makefile variable to shell environment variable (?)
export TRICK_CFLAGS := $(TRICK_CFLAGS) export TRICK_CFLAGS := $(TRICK_CFLAGS)
export TRICK_CXXFLAGS := $(TRICK_CXXFLAGS) export TRICK_CXXFLAGS := $(TRICK_CXXFLAGS)
export TRICK_LDFLAGS := $(TRICK_LDFLAGS) export TRICK_LDFLAGS := $(TRICK_LDFLAGS)
@ -67,6 +68,7 @@ export TRICK_HOST_CPU := $(shell TRICK_FORCE_32BIT=$(TRICK_FORCE_32BIT) $(TRICK_
export TRICK_EXEC_LINK_LIBS := ${PTHREAD_LIBS} $(PYTHON_LIB) $(UDUNITS_LDFLAGS) $(PLATFORM_LIBS) -lm -ldl export TRICK_EXEC_LINK_LIBS := ${PTHREAD_LIBS} $(PYTHON_LIB) $(UDUNITS_LDFLAGS) $(PLATFORM_LIBS) -lm -ldl
export TRICK_LIBS := ${RPATH} -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_units -ltrick_mm export TRICK_LIBS := ${RPATH} -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_units -ltrick_mm
export TRICK_SYSTEM_LDFLAGS := $(TRICK_SYSTEM_LDFLAGS) export TRICK_SYSTEM_LDFLAGS := $(TRICK_SYSTEM_LDFLAGS)
export TRICK_SYSTEM_ICG_EXCLUDE := $(TRICK_SYSTEM_ICG_EXCLUDE)
export TRICK_SWIG_FLAGS := $(TRICK_SWIG_FLAGS) export TRICK_SWIG_FLAGS := $(TRICK_SWIG_FLAGS)
export TRICK_SWIG_CFLAGS := $(TRICK_SWIG_CFLAGS) export TRICK_SWIG_CFLAGS := $(TRICK_SWIG_CFLAGS)
export TRICK_CONVERT_SWIG_FLAGS := $(TRICK_CONVERT_SWIG_FLAGS) export TRICK_CONVERT_SWIG_FLAGS := $(TRICK_CONVERT_SWIG_FLAGS)

1
trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp
View File

@ -206,6 +206,7 @@ void HeaderSearchDirs::addSearchDirs ( std::vector<std::string> & include_dirs,
AddCompilerBuiltInSearchDirs() ; AddCompilerBuiltInSearchDirs() ;
ApplyHeaderSearchOptions() ; ApplyHeaderSearchOptions() ;
AddDirsAndFiles("TRICK_ICG_EXCLUDE", icg_exclude_dirs) ; AddDirsAndFiles("TRICK_ICG_EXCLUDE", icg_exclude_dirs) ;
AddDirsAndFiles("TRICK_SYSTEM_ICG_EXCLUDE", icg_exclude_dirs) ;
AddDirsAndFiles("TRICK_EXCLUDE", exclude_dirs) ; AddDirsAndFiles("TRICK_EXCLUDE", exclude_dirs) ;
AddDirsAndFiles("TRICK_EXT_LIB_DIRS", ext_lib_dirs) ; AddDirsAndFiles("TRICK_EXT_LIB_DIRS", ext_lib_dirs) ;
AddDirsAndFiles("TRICK_ICG_NOCOMMENT", icg_nocomment_dirs) ; AddDirsAndFiles("TRICK_ICG_NOCOMMENT", icg_nocomment_dirs) ;