[Cmake-commits] CMake branch, next, updated. v3.0.0-4436-g6e0dc62
Brad King
brad.king at kitware.com
Tue Jul 22 14:52:45 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 6e0dc626547efdd9092218de263c40bbf9e12515 (commit)
via 832e150e9d16be0e76a14460468dcbb7ce2e3b4f (commit)
from 1b19f21ccaa452f7da5919fdd16852a5c9f38b19 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e0dc626547efdd9092218de263c40bbf9e12515
commit 6e0dc626547efdd9092218de263c40bbf9e12515
Merge: 1b19f21 832e150
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 22 14:52:44 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 22 14:52:44 2014 -0400
Merge topic 'file-GENERATE-fixes' into next
832e150e Revert topic 'file-GENERATE-fixes'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=832e150e9d16be0e76a14460468dcbb7ce2e3b4f
commit 832e150e9d16be0e76a14460468dcbb7ce2e3b4f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 22 14:53:49 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 22 14:53:49 2014 -0400
Revert topic 'file-GENERATE-fixes'
It will be revised and restored.
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 49cdba8..f9067cf 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -36,7 +36,7 @@ cmGeneratorExpressionEvaluationFile::cmGeneratorExpressionEvaluationFile(
//----------------------------------------------------------------------------
void cmGeneratorExpressionEvaluationFile::Generate(const std::string& config,
cmCompiledGeneratorExpression* inputExpression,
- std::map<std::string, std::string> &outputFiles, mode_t perm)
+ std::map<std::string, std::string> &outputFiles)
{
std::string rawCondition = this->Condition->GetInput();
if (!rawCondition.empty())
@@ -77,24 +77,17 @@ void cmGeneratorExpressionEvaluationFile::Generate(const std::string& config,
return;
}
- this->Makefile->AddCMakeOutputFile(outputFileName.c_str());
this->Files.push_back(outputFileName);
outputFiles[outputFileName] = outputContent;
cmGeneratedFileStream fout(outputFileName.c_str());
fout.SetCopyIfDifferent(true);
fout << outputContent;
- if (perm)
- {
- fout.close();
- cmSystemTools::SetPermissions(outputFileName.c_str(), perm);
- }
}
//----------------------------------------------------------------------------
void cmGeneratorExpressionEvaluationFile::Generate()
{
- mode_t perm = 0;
std::string inputContent;
if (this->InputIsContent)
{
@@ -102,9 +95,6 @@ void cmGeneratorExpressionEvaluationFile::Generate()
}
else
{
- cmSystemTools::GetPermissions(this->Input.c_str(), perm);
- this->Makefile->AddCMakeDependFile(this->Input.c_str());
-
cmsys::ifstream fin(this->Input.c_str());
if(!fin)
{
@@ -141,7 +131,7 @@ void cmGeneratorExpressionEvaluationFile::Generate()
for(std::vector<std::string>::const_iterator li = allConfigs.begin();
li != allConfigs.end(); ++li)
{
- this->Generate(*li, inputExpression.get(), outputFiles, perm);
+ this->Generate(*li, inputExpression.get(), outputFiles);
if(cmSystemTools::GetFatalErrorOccured())
{
return;
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
index 4e87a88..f939916 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -34,7 +34,7 @@ public:
private:
void Generate(const std::string& config,
cmCompiledGeneratorExpression* inputExpression,
- std::map<std::string, std::string> &outputFiles, mode_t perm);
+ std::map<std::string, std::string> &outputFiles);
private:
const std::string Input;
diff --git a/Tests/RunCMake/File_Generate/ReRunCMake-result.txt b/Tests/RunCMake/File_Generate/ReRunCMake-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/File_Generate/ReRunCMake-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt b/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/ReRunCMake.cmake b/Tests/RunCMake/File_Generate/ReRunCMake.cmake
deleted file mode 100644
index 109d60e..0000000
--- a/Tests/RunCMake/File_Generate/ReRunCMake.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-
-file(GENERATE
- OUTPUT output_file.txt
- INPUT "${CMAKE_CURRENT_BINARY_DIR}/input_file.txt"
-)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index 5752459..dee0692 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -35,32 +35,3 @@ unset(RunCMake_TEST_NO_CLEAN)
if (NOT timestamp_after STREQUAL timestamp)
message(SEND_ERROR "WriteIfDifferent changed output file.")
endif()
-
-file(MAKE_DIRECTORY "${RunCMake_BINARY_DIR}/ReRunCMake-build/")
-file(WRITE "${RunCMake_BINARY_DIR}/ReRunCMake-build/input_file.txt" "InitialContent\n")
-
-set(RunCMake_TEST_NO_CLEAN ON)
-run_cmake(ReRunCMake)
-unset(RunCMake_TEST_NO_CLEAN)
-file(TIMESTAMP "${RunCMake_BINARY_DIR}/ReRunCMake-build/output_file.txt" timestamp ${timeformat})
-if(NOT timestamp)
- message(SEND_ERROR "Could not get timestamp for \"${RunCMake_BINARY_DIR}/ReRunCMake-build/output_file.txt\"")
-endif()
-
-execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1)
-
-file(WRITE "${RunCMake_BINARY_DIR}/ReRunCMake-build/input_file.txt" "ChangedContent\n")
-execute_process(COMMAND ${CMAKE_COMMAND} --build "${RunCMake_BINARY_DIR}/ReRunCMake-build/")
-file(READ "${RunCMake_BINARY_DIR}/ReRunCMake-build/output_file.txt" out_content)
-
-if(NOT out_content STREQUAL "ChangedContent\n")
- message(SEND_ERROR "File did not change: \"${RunCMake_BINARY_DIR}/ReRunCMake-build/output_file.txt\"")
-endif()
-
-
-file(REMOVE "${RunCMake_BINARY_DIR}/ReRunCMake-build/output_file.txt")
-execute_process(COMMAND ${CMAKE_COMMAND} --build "${RunCMake_BINARY_DIR}/ReRunCMake-build/")
-
-if (NOT EXISTS "${RunCMake_BINARY_DIR}/ReRunCMake-build/output_file.txt")
- message(SEND_ERROR "File did not re-generate: \"${RunCMake_BINARY_DIR}/ReRunCMake-build/output_file.txt\"")
-endif()
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpressionEvaluationFile.cxx | 14 ++--------
Source/cmGeneratorExpressionEvaluationFile.h | 2 +-
Tests/RunCMake/File_Generate/ReRunCMake-result.txt | 1 -
Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt | 1 -
Tests/RunCMake/File_Generate/ReRunCMake.cmake | 5 ----
Tests/RunCMake/File_Generate/RunCMakeTest.cmake | 29 --------------------
6 files changed, 3 insertions(+), 49 deletions(-)
delete mode 100644 Tests/RunCMake/File_Generate/ReRunCMake-result.txt
delete mode 100644 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
delete mode 100644 Tests/RunCMake/File_Generate/ReRunCMake.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list