ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

deconflicting config_user_cmake.mk.in for make-cmake merge

Browse Source
This commit is contained in:
Alex Lin 2019-11-12 08:09:30 -06:00
parent 0fe848048b
commit 174f7f1dc9
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -72,7 +72,7 @@ foreach ( infile ${ER7_UTIL_HEADERS} )
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/trick_source/er7_utils/${infile} DESTINATION "${CMAKE_BINARY_DIR}/include/er7_utils/${dir}") file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/trick_source/er7_utils/${infile} DESTINATION "${CMAKE_BINARY_DIR}/include/er7_utils/${dir}")
endforeach(infile) endforeach(infile)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/share/trick/makefiles/config_user.mk.in ${CMAKE_BINARY_DIR}/share/trick/makefiles/config_user.mk) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/share/trick/makefiles/config_user_cmake.mk.in ${CMAKE_BINARY_DIR}/share/trick/makefiles/config_user.mk)
############################################################### ###############################################################
# mongoose lib # mongoose lib

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

@ -110,6 +110,16 @@ ifeq ($(USE_ER7_UTILS),ON)
TRICK_SYSTEM_CXXFLAGS += -DUSE_ER7_UTILS_CHECKPOINTHELPER TRICK_SYSTEM_CXXFLAGS += -DUSE_ER7_UTILS_CHECKPOINTHELPER
endif endif
endif endif
# older test, remove when cmake is only build system
ifeq ($(USE_ER7_UTILS), 1)
ER7_UTILS_HOME := $(TRICK_HOME)/trick_source/er7_utils
TRICK_SYSTEM_CXXFLAGS += -DUSE_ER7_UTILS_INTEGRATORS
TRICK_LIBS += -ler7_utils
ifneq ($(wildcard ${ER7_UTILS_HOME}/CheckpointHelper),)
USE_ER7_UTILS_CHECKPOINTHELPER = 1
TRICK_SYSTEM_CXXFLAGS += -DUSE_ER7_UTILS_CHECKPOINTHELPER
endif
endif
ifeq ($(TRICK_FORCE_32BIT),ON) ifeq ($(TRICK_FORCE_32BIT),ON)
TRICK_ICGFLAGS += -m32 TRICK_ICGFLAGS += -m32
@ -117,6 +127,13 @@ ifeq ($(TRICK_FORCE_32BIT),ON)
TRICK_SYSTEM_LDFLAGS += -m32 TRICK_SYSTEM_LDFLAGS += -m32
LD_PARTIAL += -melf_i386 LD_PARTIAL += -melf_i386
endif endif
# older test, remove when cmake is only build system
ifeq ($(TRICK_FORCE_32BIT), 1)
TRICK_ICGFLAGS += -m32
TRICK_SYSTEM_CXXFLAGS += -m32
TRICK_SYSTEM_LDFLAGS += -m32
LD_PARTIAL += -melf_i386
endif
IS_CC_CLANG = $(shell ${TRICK_CXX} -xc /dev/null -dM -E | grep -c __clang__) IS_CC_CLANG = $(shell ${TRICK_CXX} -xc /dev/null -dM -E | grep -c __clang__)
ifeq ($(IS_CC_CLANG), 1) ifeq ($(IS_CC_CLANG), 1)

0
share/trick/makefiles/config_user.mk.in → share/trick/makefiles/config_user_cmake.mk.in
View File