ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-06-21 08:29:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

er7_util header files not being installed

Browse Source 
Added a makefile install rule to copy the header files out of
er7_utils to the install directory.  Adjusted ICG to ignore
Trick header files if they are installed.

refs #246
This commit is contained in:
Alex Lin
2016-06-20 13:40:45 -05:00
parent 11fb71f036
commit c9e3bc77da
3 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,12 @@ void HeaderSearchDirs::AddTrickSearchDirs () {
std::string temp_dir = std::string(trick_home) + "/include/trick" ;
char * resolved_path = almostRealPath(temp_dir.c_str() ) ;
hso.AddPath(resolved_path , clang::frontend::Quoted, false, true);
trick_include_dir = std::string(resolved_path) ;
//trick_include_dir = std::string(resolved_path) ;
free(resolved_path) ;
temp_dir = std::string(trick_home) + "/include/er7_utils" ;
resolved_path = almostRealPath(temp_dir.c_str() ) ;
hso.AddPath(resolved_path , clang::frontend::Quoted, false, true);
free(resolved_path) ;
temp_dir = std::string(trick_home) + "/trick_source" ;
@ -129,6 +134,10 @@ void HeaderSearchDirs::AddTrickSearchDirs () {
hso.AddPath(resolved_path , clang::frontend::Quoted, false, true);
trick_source_dir = std::string(resolved_path) ;
free(resolved_path) ;
temp_dir = std::string(trick_home) + "/include" ;
resolved_path = almostRealPath(temp_dir.c_str() ) ;
trick_include_dir = std::string(resolved_path) ;
}
}