ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-19 21:27:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

In Makefile.common, don't allow TRICK_CIVET to be enabled. #1188

Browse Source
This commit is contained in:
Penn, John M 047828115 2021-09-14 01:10:11 -05:00
parent 6865501781
commit 90639e35d5
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,13 +172,6 @@ ifneq ($(GSL_HOME),)
endif endif
TRICK_CIVET=0 TRICK_CIVET=0
ifneq (${TRICK_DISABLE_CIVET},1)
TRICK_CIVET=1
TRICK_LIBS += ${TRICK_LIB_DIR}/libcivetweb.a ${TRICK_LIB_DIR}/libtrickCivet.a
TRICK_SWIG_FLAGS += -DUSE_CIVET
TRICK_SYSTEM_CXXFLAGS += -DUSE_CIVET
TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/civet
endif
# We pipe the output of compiler through tee. If the user wanted gcc color, make sure they get it. # We pipe the output of compiler through tee. If the user wanted gcc color, make sure they get it.
ifdef GCC_COLORS ifdef GCC_COLORS