[Cmake-commits] CMake branch, next, updated. v3.0.2-2095-gdb22abd

[Stephen Kelly]

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  db22abdbf75844ef694ca675440d4d838eae4878 (commit)
       via  cdbb0c937df588536ad878e94d6c8798bf3dd0c0 (commit)
      from  4edcc532b3a326a6a673d3631440ed8079bf662b (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=db22abdbf75844ef694ca675440d4d838eae4878
commit db22abdbf75844ef694ca675440d4d838eae4878
Merge: 4edcc53 cdbb0c9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 20 16:59:02 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 20 16:59:02 2014 -0400

    Merge topic 'fix-file-GENERATE-source-files' into next
    
    cdbb0c93 Revert "file(GENERATE): Evaluate early to allow generating source files"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdbb0c937df588536ad878e94d6c8798bf3dd0c0
commit cdbb0c937df588536ad878e94d6c8798bf3dd0c0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 20 22:56:30 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 20 22:56:30 2014 +0200

    Revert "file(GENERATE): Evaluate early to allow generating source files"
    
    This reverts commit 28fedb192175668668e02e0bfd47fde337b83899.
    
    Aside from the requirement to appear before TraceDependencies, there is
    a separate requirement to appear after it, because it may change the
    resulting content.
    
    The solution is probably to try to mark GENERATED output files as such,
    but I'd have to investigate to see if TraceDependencies can cause different
    genex evaluation before and after, and whether that causes future
    limitations.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7e46f05..ae0e807 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1253,8 +1253,6 @@ void cmGlobalGenerator::Generate()
   // Create per-target generator information.
   this->CreateGeneratorTargets();
 
-  this->ProcessEvaluationFiles();
-
   this->ForceLinkerLanguages();
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
@@ -1278,6 +1276,8 @@ void cmGlobalGenerator::Generate()
     this->LocalGenerators[i]->GenerateTargetManifest();
     }
 
+  this->ProcessEvaluationFiles();
+
   // Compute the inter-target dependencies.
   if(!this->ComputeTargetDepends())
     {
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-result.txt b/Tests/RunCMake/File_Generate/GenerateSource-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/File_Generate/GenerateSource-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/GenerateSource.cmake b/Tests/RunCMake/File_Generate/GenerateSource.cmake
deleted file mode 100644
index 8a419ce..0000000
--- a/Tests/RunCMake/File_Generate/GenerateSource.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-
-cmake_minimum_required(VERSION 3.0)
-
-project(cmaketest)
-
-# Ensure re-generation
-file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
-
-file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/main.cpp"
-  CONTENT "int main() { return 0; }\n"
-)
-
-add_executable(mn "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index fb0e917..dee0692 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -8,7 +8,6 @@ run_cmake(EmptyCondition1)
 run_cmake(EmptyCondition2)
 run_cmake(BadCondition)
 run_cmake(DebugEvaluate)
-run_cmake(GenerateSource)
 
 set(timeformat "%Y%j%H%M%S")
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx                           |    4 ++--
 Tests/RunCMake/File_Generate/GenerateSource-result.txt |    1 -
 Tests/RunCMake/File_Generate/GenerateSource-stderr.txt |    1 -
 Tests/RunCMake/File_Generate/GenerateSource.cmake      |   14 --------------
 Tests/RunCMake/File_Generate/RunCMakeTest.cmake        |    1 -
 5 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 Tests/RunCMake/File_Generate/GenerateSource-result.txt
 delete mode 100644 Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/GenerateSource.cmake


hooks/post-receive
-- 
CMake