kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-try_compile-internal-argv' 

710bde43 cmCoreTryCompile: Fix internal argument vector construction
This commit is contained in:
Brad King 2015-09-25 10:12:42 -04:00 committed by CMake Topic Stage
parent 5a83303f50 710bde43aa
commit 02f95f9b7c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmCoreTryCompile.cxx
View File

@ -29,7 +29,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
const char* sourceDirectory = argv[2].c_str(); const char* sourceDirectory = argv[2].c_str();
const char* projectName = 0; const char* projectName = 0;
std::string targetName; std::string targetName;
std::vector<std::string> cmakeFlags; std::vector<std::string> cmakeFlags(1, "CMAKE_FLAGS"); // fake argv[0]
std::vector<std::string> compileDefs; std::vector<std::string> compileDefs;
std::string outputVariable; std::string outputVariable;
std::string copyFile; std::string copyFile;
@ -53,10 +53,6 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
if(argv[i] == "CMAKE_FLAGS") if(argv[i] == "CMAKE_FLAGS")
{ {
doing = DoingCMakeFlags; doing = DoingCMakeFlags;
// CMAKE_FLAGS is the first argument because we need an argv[0] that
// is not used, so it matches regular command line parsing which has
// the program name as arg 0
cmakeFlags.push_back(argv[i]);
} }
else if(argv[i] == "COMPILE_DEFINITIONS") else if(argv[i] == "COMPILE_DEFINITIONS")
{ {