ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-10 12:41:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ball sim compiling and running

Browse Source
This commit is contained in:
Alex Lin 2019-11-06 11:24:23 -06:00
parent ee666371d8
commit 0cbbb37a73
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -20,7 +20,9 @@ find_package(PythonInterp REQUIRED)
find_package(PythonLibs REQUIRED)
find_package(SWIG REQUIRED)
find_package(Tee REQUIRED)
find_package(Threads REQUIRED)
find_package(UDUNITS2 REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(HDF5)
find_package(GSL)
@ -60,6 +62,7 @@ add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mongoose/mongoose.c
COMMAND curl --retry 4 -O https://raw.githubusercontent.com/cesanta/mongoose/6.16/mongoose.c
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mongoose
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include/mongoose/mongoose.h
)
###############################################################
@ -869,7 +872,7 @@ set( SWIG_SRC_BASENAME
set(SWIG_FLAGS -DUSE_ER7_UTILS_INTEGRATORS -D_HAVE_GSL)
foreach ( infile ${SWIG_SRC_BASENAME} )
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/swig/${infile}_wrap.cpp
COMMAND ${SWIG_EXECUTABLE} ${SWIG_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/trick_source -I${CMAKE_CURRENT_SOURCE_DIR}/include -I${CMAKE_CURRENT_SOURCE_DIR} -c++ -python -includeall -ignoremissing -w201,362,389,451 -o $@ -outdir ${CMAKE_CURRENT_BINARY_DIR}/swig ${CMAKE_CURRENT_SOURCE_DIR}/trick_source/trick_swig/${infile}.i
COMMAND ${SWIG_EXECUTABLE} ${SWIG_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/trick_source -I${CMAKE_CURRENT_SOURCE_DIR}/include -I${CMAKE_CURRENT_SOURCE_DIR} -c++ -python -includeall -ignoremissing -w201,362,389,451 -o $@ -outdir ${CMAKE_CURRENT_BINARY_DIR}/share/trick/swig ${CMAKE_CURRENT_SOURCE_DIR}/trick_source/trick_swig/${infile}.i
)
endforeach(infile)

2
libexec/trick/make_makefile_swig
View File

@ -141,7 +141,7 @@ sub write_makefile_swig() {
print PY_LINK_LIST "build/init_swig_modules.o\n" ;
print PY_LINK_LIST "build/top.o\n" ;
print MAKEFILE "TRICK_SYSTEM_SWIG_CFLAGS := -I../include \${PYTHON_INCLUDES} -Wno-shadow -Wno-missing-field-initializers
print MAKEFILE "TRICK_SYSTEM_SWIG_CFLAGS := -I../include \${PYTHON_INCLUDES} -Wno-shadow -Wno-missing-field-initializers -Wno-cast-function-type
ifeq (\$(IS_CC_CLANG), 1)
TRICK_SYSTEM_SWIG_CFLAGS += -Wno-self-assign -Wno-sometimes-uninitialized -Wno-deprecated-register

32
share/trick/makefiles/config_user.mk.in
View File

@ -13,34 +13,36 @@ CLANG = @CLANG_EXECUTABLE@
TEE = @TEE_EXECUTABLE@
USE_JAVA = @USE_JAVA@
JAVAC = @JAVA_CC@
JAVAC = @Java_JAVAC_EXECUTABLE@
USE_X_WINDOWS = @USE_X_WINDOWS@
LLVM_HOME = @LLVM_HOME@
LLVM_HOME = @LLVM_ROOT_DIR@
PYTHON_INCLUDES = @PYTHON_CPPFLAGS@
PYTHON_LIB = @PYTHON_LIBS@ @PYTHON_EXTRA_LDFLAGS@
# @PYTHON_EXTRA_LIBS@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON_INCLUDES = -I@PYTHON_INCLUDE_DIRS@
PYTHON_LIB = @PYTHON_LIBRARIES@
X_LIB_DIR = @X_LIB_DIR@
MOTIF_HOME = @MOTIF_HOME@
UDUNITS_INCLUDES = @UDUNITS_INCLUDES@
UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
UDUNITS_INCLUDES = -I@UDUNITS2_INCLUDES@
UDUNITS_LDFLAGS = @UDUNITS2_LIBRARIES@
TRICK_EXCLUDE += :@UDUNITS_EXCLUDE@
LIBXML_INCLUDES = -I@LIBXML2_INCLUDE_DIR@
LIBXML = @LIBXML2_LIBRARIES@
PTHREAD_LIBS = @CMAKE_THREAD_LIBS_INIT@
GSL_HOME = @GSL_ROOT_DIR@
HDF5 = @HDF5_HOME@
GTEST_HOME = @GTEST_HOME@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
X_LIB_DIR = @X_LIB_DIR@
MOTIF_HOME = @MOTIF_HOME@
DMTCP = @DMTCP_HOME@
TPROCTE = @TPRO_HOME@
BC635 = @BC635_HOME@
GSL_HOME = @GSL_HOME@
GTEST_HOME = @GTEST_HOME@
USE_ER7_UTILS = @USE_ER7_UTILS@
LIBXML = @LIBXML@
PREFIX ?= @prefix@
CONFIG_MK = 1