diff options
author | Brad King <brad.king@kitware.com> | 2019-02-20 14:01:44 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-20 14:03:48 (GMT) |
commit | c2f6da3399efa1448eadbae65311795ced3f8930 (patch) | |
tree | 22029ba1982f7d4964772abfc78a0fc1a9f1d44a /Source/cmCreateTestSourceList.cxx | |
parent | b38023f958325fedd99d5480149f4958e721fdd5 (diff) | |
parent | 0281f9a4cad6e189601a87c9ccfba8c54e71e14b (diff) | |
download | CMake-c2f6da3399efa1448eadbae65311795ced3f8930.zip CMake-c2f6da3399efa1448eadbae65311795ced3f8930.tar.gz CMake-c2f6da3399efa1448eadbae65311795ced3f8930.tar.bz2 |
Merge topic 'configurefile-stdstring'
0281f9a4ca cmMakefile::ConfigureFile: Accept `std::string` parameters
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2982
Diffstat (limited to 'Source/cmCreateTestSourceList.cxx')
-rw-r--r-- | Source/cmCreateTestSourceList.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmCreateTestSourceList.cxx b/Source/cmCreateTestSourceList.cxx index 69532e6..b78493f 100644 --- a/Source/cmCreateTestSourceList.cxx +++ b/Source/cmCreateTestSourceList.cxx @@ -136,8 +136,7 @@ bool cmCreateTestSourceList::InitialPass(std::vector<std::string> const& args, this->Makefile->AddDefinition("CMAKE_FUNCTION_TABLE_ENTIRES", functionMapCode.c_str()); bool res = true; - if (!this->Makefile->ConfigureFile(configFile.c_str(), driver.c_str(), false, - true, false)) { + if (!this->Makefile->ConfigureFile(configFile, driver, false, true, false)) { res = false; } |