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

Preparing to merge cmake changes into master

Browse Source
This commit is contained in:
Alex Lin 2019-11-12 07:32:23 -06:00
parent d808bbd578
commit ecc4abc670
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trick_source/codegen/Interface_Code_Gen/CMakeLists.txt
View File

@ -26,6 +26,7 @@ set ( ICG_SRC
add_executable( trick-ICG ${ICG_SRC} )
target_compile_options( trick-ICG PUBLIC -g -DTRICK_VERSION="${TRICK_MAJOR}.${TRICK_MINOR}.${TRICK_TINY}" -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS)
target_compile_options( trick-ICG PUBLIC -DLIBCLANG_MAJOR=${LLVM_VERSION_MAJOR} -DLIBCLANG_MINOR=${LLVM_VERSION_MINOR})
target_compile_options( trick-ICG PUBLIC -DEXTERNAL_BUILD)
target_include_directories( trick-ICG PUBLIC ${UDUNITS2_INCLUDES} )
target_include_directories( trick-ICG PUBLIC ${LLVM_INCLUDE_DIR} )
set_property(SOURCE trick-ICG APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/include/mongoose/mongoose.h)

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

@ -36,7 +36,7 @@ void HeaderSearchDirs::AddCompilerBuiltInSearchDirs () {
// Add clang specific include directory first. Only required on linux systems. :(
// This is so that ICG will find clang friendly headers first. gcc headers cause
// all kinds of problems. On macs all headers are clang friendly.
#if 0
#ifndef EXTERNAL_BUILD
#if __linux
std::stringstream icg_dir ;
icg_dir << LLVM_HOME << "/lib/clang/" ;

4
trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
View File

@ -274,7 +274,11 @@ void PrintAttributes::createMapFiles() {
std::string enum_map_function_name ;
if ( sim_services_flag ) {
#ifdef EXTERNAL_DIR
map_dir = output_dir ;
#else
map_dir = "trick_source/sim_services/include/io_src" ;
#endif
class_map_function_name = "populate_sim_services_class_map" ;
enum_map_function_name = "populate_sim_services_enum_map" ;
} else {