[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-525-ge15afa2

[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  e15afa23efdaa409f5f809444fa1ceb98f18210b (commit)
       via  1d4979a5cd69a115c91d04a343925d2860b92c1e (commit)
      from  6638bfeba68c732f5441e00fdcd807957d3b041a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e15afa23efdaa409f5f809444fa1ceb98f18210b
commit e15afa23efdaa409f5f809444fa1ceb98f18210b
Merge: 6638bfe 1d4979a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 18:37:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 18:37:17 2015 -0400

    Merge topic 'init-state-for-subdirs' into next
    
    1d4979a5 Revert "Subdirs: Initialize from parent before configuring."


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d4979a5cd69a115c91d04a343925d2860b92c1e
commit 1d4979a5cd69a115c91d04a343925d2860b92c1e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 00:36:34 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 00:36:34 2015 +0200

    Revert "Subdirs: Initialize from parent before configuring."
    
    This reverts commit 7dac31b2292b0eac32929649cad1f32e6f0a6114.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3b8c188..73d3522 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1682,7 +1682,6 @@ void cmMakefile::Configure()
   std::vector<cmMakefile*>::iterator sdi = subdirs.begin();
   for (; sdi != subdirs.end(); ++sdi)
     {
-    (*sdi)->StateSnapshot.InitializeFromParent_ForSubdirsCommand();
     this->ConfigureSubDirectory(*sdi);
     }
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index eb0145e..72c7330 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1366,11 +1366,6 @@ std::string cmState::Snapshot::GetProjectName() const
   return this->Position->BuildSystemDirectory->ProjectName;
 }
 
-void cmState::Snapshot::InitializeFromParent_ForSubdirsCommand()
-{
-  this->InitializeFromParent();
-}
-
 cmState::Directory::Directory(
     cmLinkedTree<BuildsystemDirectoryStateType>::iterator iter,
     const cmState::Snapshot& snapshot)
diff --git a/Source/cmState.h b/Source/cmState.h
index 4f714a6..2f66f7f 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -90,8 +90,6 @@ public:
     void SetProjectName(std::string const& name);
     std::string GetProjectName() const;
 
-    void InitializeFromParent_ForSubdirsCommand();
-
     struct StrictWeakOrder
     {
       bool operator()(const cmState::Snapshot& lhs,
diff --git a/Tests/SubDir/CMakeLists.txt b/Tests/SubDir/CMakeLists.txt
index 32aa93f..6822e6b 100644
--- a/Tests/SubDir/CMakeLists.txt
+++ b/Tests/SubDir/CMakeLists.txt
@@ -1,10 +1,6 @@
 cmake_minimum_required (VERSION 2.6)
 project(SUBDIR)
-
 subdirs(Executable EXCLUDE_FROM_ALL Examples)
-
-set(DEFINED_AFTER_SUBDIRS_COMMAND 42)
-
 write_file(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.")
 #WATCOM WMAKE does not support + in the name of a file!
 if(WATCOM)
diff --git a/Tests/SubDir/Executable/CMakeLists.txt b/Tests/SubDir/Executable/CMakeLists.txt
index e1e5ef3..77e6751 100644
--- a/Tests/SubDir/Executable/CMakeLists.txt
+++ b/Tests/SubDir/Executable/CMakeLists.txt
@@ -1,5 +1 @@
 add_executable(test test.cxx)
-
-if (NOT DEFINED_AFTER_SUBDIRS_COMMAND)
-  message(FATAL_ERROR "DEFINED_AFTER_SUBDIRS_COMMAND should be defined.")
-endif()

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

Summary of changes:
 Source/cmMakefile.cxx                  |    1 -
 Source/cmState.cxx                     |    5 -----
 Source/cmState.h                       |    2 --
 Tests/SubDir/CMakeLists.txt            |    4 ----
 Tests/SubDir/Executable/CMakeLists.txt |    4 ----
 5 files changed, 16 deletions(-)


hooks/post-receive
-- 
CMake