ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-06-16 14:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make TRICK_CXX variable to specify c++ compiler #767 (#815)

Browse Source 
Changed all references of TRICK_CPPC to TRICK_CXX.  Added a
warning message that TRICK_CPPC has been deprecated.
This commit is contained in:
Alex Lin
2019-06-18 11:00:08 -05:00
committed by GitHub
parent 187fa37540
commit 497f11f132
28 changed files with 113 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,13 +50,13 @@ void HeaderSearchDirs::AddCompilerBuiltInSearchDirs () {
}
#endif
fp = popen("${TRICK_HOME}/bin/trick-gte TRICK_CPPC" , "r") ;
fp = popen("${TRICK_HOME}/bin/trick-gte TRICK_CXX" , "r") ;
fgets(line , sizeof(line) , fp) ;
pclose(fp) ;
std::string trick_cppc = std::string(line) ;
std::string command ;
trick_cppc.erase(trick_cppc.find_last_not_of(" \n\r\t")+1) ;
//std::cout << "TRICK_CPPC = " << trick_cppc << std::endl ;
//std::cout << "TRICK_CXX = " << trick_cppc << std::endl ;
command = std::string("echo | ") + trick_cppc + std::string(" -v -xc++ -E - 2>&1") ;
//std::cout << "command = " << command << std::endl ;

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

@ -130,7 +130,7 @@ class HeaderSearchDirs {
/** ${TRICK_HOME}/include/trick resolved */
std::string trick_include_dir ;
/** Adds all of the built-in system paths contained in the TRICK_CPPC compiler */
/** Adds all of the built-in system paths contained in the TRICK_CXX compiler */
void AddCompilerBuiltInSearchDirs () ;
/** Adds all of the paths specified on the command line */

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

@ -377,7 +377,7 @@ void PrintAttributes::printIOMakefile() {
<< std::endl
<< "$(IO_OBJECTS): \%.o : \%.cpp | \%.d" << std::endl
<< "\t$(PRINT_COMPILE)" << std::endl
<< "\t$(call ECHO_AND_LOG,$(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(TRICK_IO_CXXFLAGS) -MMD -MP -c -o $@ $<)" << std::endl
<< "\t$(call ECHO_AND_LOG,$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(TRICK_IO_CXXFLAGS) -MMD -MP -c -o $@ $<)" << std::endl
<< std::endl
<< "$(IO_OBJECTS:.o=.d): ;" << std::endl
<< std::endl