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

BUG: remove duplicate depend on cache file and use of make variable in make target

This commit is contained in:
Bill Hoffman 2004-04-30 11:36:54 -04:00
parent 7eab2e4235
commit 858564fb10
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -2552,7 +2552,6 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
checkCache += "/cmake.check_cache"; checkCache += "/cmake.check_cache";
checkCache = this->ConvertToRelativeOutputPath(checkCache.c_str()); checkCache = this->ConvertToRelativeOutputPath(checkCache.c_str());
std::vector<std::string> cmake_depends; std::vector<std::string> cmake_depends;
cmake_depends.push_back(checkCache);
cmake_depends.push_back("$(CMAKE_MAKEFILE_SOURCES)"); cmake_depends.push_back("$(CMAKE_MAKEFILE_SOURCES)");
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
@ -2596,7 +2595,6 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
std::string CMakeCache = m_Makefile->GetHomeOutputDirectory(); std::string CMakeCache = m_Makefile->GetHomeOutputDirectory();
CMakeCache += "/CMakeCache.txt"; CMakeCache += "/CMakeCache.txt";
CMakeCache = this->ConvertToRelativeOutputPath(CMakeCache.c_str()); CMakeCache = this->ConvertToRelativeOutputPath(CMakeCache.c_str());
check_cache_depends.push_back(CMakeCache);
check_cache_depends.push_back("$(CMAKE_MAKEFILE_SOURCES)"); check_cache_depends.push_back("$(CMAKE_MAKEFILE_SOURCES)");
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
@ -2625,10 +2623,12 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"$(CMAKE_COMMAND) " "$(CMAKE_COMMAND) "
"-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -i"); "-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, this->OutputMakeRule(fout,
"CMakeCache.txt", "CMakeCache.txt",
"$(CMAKE_BINARY_DIR)/CMakeCache.txt", cacheFile.c_str(),
0, 0,
"$(CMAKE_COMMAND) " "$(CMAKE_COMMAND) "
"-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)"); "-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)");