diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-04-30 15:36:54 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-04-30 15:36:54 (GMT) |
| commit | 858564fb103666adc26d3e8077cbded1fcbe0b18 (patch) | |
| tree | a15df48e1be1c1d082ab227203b1ec3760503482 | |
| parent | 7eab2e4235374bbcc035a375af3bb2827c54a425 (diff) | |
| download | CMake-858564fb103666adc26d3e8077cbded1fcbe0b18.zip CMake-858564fb103666adc26d3e8077cbded1fcbe0b18.tar.gz CMake-858564fb103666adc26d3e8077cbded1fcbe0b18.tar.bz2 | |
BUG: remove duplicate depend on cache file and use of make variable in make target
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index c3ebabf..1f0575d 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -2552,7 +2552,6 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout) checkCache += "/cmake.check_cache"; checkCache = this->ConvertToRelativeOutputPath(checkCache.c_str()); std::vector<std::string> cmake_depends; - cmake_depends.push_back(checkCache); cmake_depends.push_back("$(CMAKE_MAKEFILE_SOURCES)"); this->OutputMakeRule(fout, @@ -2596,7 +2595,6 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout) std::string CMakeCache = m_Makefile->GetHomeOutputDirectory(); CMakeCache += "/CMakeCache.txt"; CMakeCache = this->ConvertToRelativeOutputPath(CMakeCache.c_str()); - check_cache_depends.push_back(CMakeCache); check_cache_depends.push_back("$(CMAKE_MAKEFILE_SOURCES)"); this->OutputMakeRule(fout, @@ -2625,10 +2623,12 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout) "$(CMAKE_COMMAND) " "-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -i"); } - + std::string cacheFile = m_Makefile->GetHomeOutputDirectory(); + cacheFile += "/CMakeCache.txt"; + cacheFile = this->ConvertToRelativeOutputPath(cacheFile.c_str()); this->OutputMakeRule(fout, "CMakeCache.txt", - "$(CMAKE_BINARY_DIR)/CMakeCache.txt", + cacheFile.c_str(), 0, "$(CMAKE_COMMAND) " "-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)"); |