diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index cadd0cd..344871b 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -278,9 +278,10 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, linkLibs += cmSystemTools::EscapeSpaces(dir.c_str()); linkLibs += " "; librariesLinked += "-l"; - if(reg.find(file)) + cmRegularExpression libname("lib(.*)\\.(.*)"); + if(libname.find(file)) { - file = reg.match(1); + file = libname.match(1); } librariesLinked += file; librariesLinked += " "; @@ -827,6 +828,12 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout) "${CMAKE_COMMAND} " "-H${CMAKE_SOURCE_DIR} -B${CMAKE_BINARY_DIR}"); this->OutputMakeRule(fout, + "Rebuild the cache", + "${CMAKE_BINARY_DIR}/CMakeCache.txt", + 0, + "${CMAKE_COMMAND} " + "-H${CMAKE_SOURCE_DIR} -B${CMAKE_BINARY_DIR}"); + this->OutputMakeRule(fout, "Rebuild cmake dummy rule", "${CMAKE_COMMAND}", 0, |