[Cmake-commits] CMake branch, next, updated. v3.5.0-624-g334f492

[Brad King]

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  334f492602a7aaf03fc87ddc33ef82fb9081b14f (commit)
       via  0fc2e73715a622240613875c5b2ed91b32237c66 (commit)
       via  0804005a694a882090965f40f67a77a621fbdd7e (commit)
      from  d28eac7b6e09b3357d6c3b787c61fa9b29078b59 (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=334f492602a7aaf03fc87ddc33ef82fb9081b14f
commit 334f492602a7aaf03fc87ddc33ef82fb9081b14f
Merge: d28eac7 0fc2e73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 23 13:23:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 23 13:23:00 2016 -0400

    Merge topic 'vs-startup-project' into next
    
    0fc2e737 fixup! VS: Put ALL_BUILD in the PREDEFINED_TARGETS_FOLDER
    0804005a fixup! VS: Fix default target support for targets nested inside a folder


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fc2e73715a622240613875c5b2ed91b32237c66
commit 0fc2e73715a622240613875c5b2ed91b32237c66
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 23 13:11:35 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 23 13:20:02 2016 -0400

    fixup! VS: Put ALL_BUILD in the PREDEFINED_TARGETS_FOLDER

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 9817b09..04146fb 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -92,7 +92,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
       //
       // Organize in the "predefined targets" folder:
       //
-      if (this->UseFolderProperty())
+      if (this->UseFolderProperty() && this->GetVersion() > VS71)
         {
         allBuild->SetProperty("FOLDER", this->GetPredefinedTargetsFolder());
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0804005a694a882090965f40f67a77a621fbdd7e
commit 0804005a694a882090965f40f67a77a621fbdd7e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 23 13:11:25 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 23 13:19:59 2016 -0400

    fixup! VS: Fix default target support for targets nested inside a folder

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 289fbb5..7b51fdf 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -97,16 +97,30 @@ void cmGlobalVisualStudio71Generator
   OrderedTargetDependSet orderedProjectTargets(
     projectTargets, this->GetStartupProjectName(root));
 
-  std::stringstream targetsSlnString;
+  // Generate the targets specification to a string.  We will put this in
+  // the actual .sln file later.  As a side effect, this method also
+  // populates the set of folders.
+  std::ostringstream targetsSlnString;
   this->WriteTargetsToSolution(targetsSlnString, root, orderedProjectTargets);
 
+  // VS 7 does not support folders specified first.
+  if (this->GetVersion() <= VS71)
+    {
+    fout << targetsSlnString.str();
+    }
+
+  // Generate folder specification.
   bool useFolderProperty = this->UseFolderProperty();
   if (useFolderProperty)
     {
     this->WriteFolders(fout);
     }
 
-  fout << targetsSlnString.str();
+  // Now write the actual target specification content.
+  if (this->GetVersion() > VS71)
+    {
+    fout << targetsSlnString.str();
+    }
 
   // Write out the configurations information for the solution
   fout << "Global\n";
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c7fe649..0207753 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -234,7 +234,10 @@ endif()
 
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
   add_RunCMake_test(include_external_msproject)
-  add_RunCMake_test(VSSolution)
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([789]|10)" AND NOT CMAKE_VS_DEVENV_COMMAND)
+    set(NO_USE_FOLDERS 1)
+  endif()
+  add_RunCMake_test(VSSolution -DNO_USE_FOLDERS=${NO_USE_FOLDERS})
 endif()
 
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([^789]|[789][0-9])")
diff --git a/Tests/RunCMake/VSSolution/RunCMakeTest.cmake b/Tests/RunCMake/VSSolution/RunCMakeTest.cmake
index 19b309c..afd74a1 100644
--- a/Tests/RunCMake/VSSolution/RunCMakeTest.cmake
+++ b/Tests/RunCMake/VSSolution/RunCMakeTest.cmake
@@ -10,4 +10,7 @@ run_cmake(Override1)
 run_cmake(Override2)
 run_cmake(StartupProject)
 run_cmake(StartupProjectMissing)
-run_cmake(StartupProjectUseFolders)
+
+if(RunCMake_GENERATOR MATCHES "Visual Studio ([^7]|[7][0-9])" AND NOT NO_USE_FOLDERS)
+  run_cmake(StartupProjectUseFolders)
+endif()

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

Summary of changes:
 Source/cmGlobalVisualStudio71Generator.cxx   |   18 ++++++++++++++++--
 Source/cmGlobalVisualStudioGenerator.cxx     |    2 +-
 Tests/RunCMake/CMakeLists.txt                |    5 ++++-
 Tests/RunCMake/VSSolution/RunCMakeTest.cmake |    5 ++++-
 4 files changed, 25 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake