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

Standardize directory names

Browse Source 
Moved the io_src code created by sim_services to sim_servivces/include.  Also found some makefiles that needed to be changed to refer to the makefiles in their new locations.

refs #63
This commit is contained in:
Alex Lin
2015-06-02 10:25:40 -05:00
parent 24cfabbdef
commit 60e3983344
12 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,16 @@ void HeaderSearchDirs::AddTrickSearchDirs () {
hso.AddPath(resolved_path , clang::frontend::Quoted, false, true);
#else
hso.AddPath(resolved_path , clang::frontend::Quoted, true, false, true);
#endif
trick_include_dir = std::string(resolved_path) ;
free(resolved_path) ;
temp_dir = std::string(trick_home) + "/trick_source" ;
resolved_path = almostRealPath(temp_dir.c_str() ) ;
#if (__clang_major__ == 3) && (__clang_minor__ >= 3)
hso.AddPath(resolved_path , clang::frontend::Quoted, false, true);
#else
hso.AddPath(resolved_path , clang::frontend::Quoted, true, false, true);
#endif
trick_source_dir = std::string(resolved_path) ;
free(resolved_path) ;
@ -210,7 +220,9 @@ bool HeaderSearchDirs::isPathInUserDir (std::string in_dir ) {
return false ;
}
}
if ( ! sim_services and ! in_dir.compare(0, trick_source_dir.size(), trick_source_dir)) {
if ( ! sim_services and
(! in_dir.compare(0, trick_source_dir.size(), trick_source_dir) or
! in_dir.compare(0, trick_include_dir.size(), trick_include_dir)) ) {
return false ;
}