[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2740-gf3b4525

[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  f3b4525969f174fe00d5f6ed4168e51e644e5922 (commit)
       via  6fb2e243a67045d99df95aa99c4fcbc7a72dd0fc (commit)
       via  57bab2db8156e22a50e2917e0425b5f3ecf6bc81 (commit)
      from  f0d05cca10091f7f288d77c7fa861a9f86e37ba7 (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=f3b4525969f174fe00d5f6ed4168e51e644e5922
commit f3b4525969f174fe00d5f6ed4168e51e644e5922
Merge: f0d05cc 6fb2e24
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 9 10:25:41 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 9 10:25:41 2013 -0400

    Merge topic 'msbuild-targets-in-subdirs' into next
    
    6fb2e24 Fix CTest.BuildCommand.ProjectInSubdir on non-Windows
    57bab2d Xcode: Add projectDir parameter to GenerateBuildCommand


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6fb2e243a67045d99df95aa99c4fcbc7a72dd0fc
commit 6fb2e243a67045d99df95aa99c4fcbc7a72dd0fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 9 10:21:42 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 9 10:22:44 2013 -0400

    Fix CTest.BuildCommand.ProjectInSubdir on non-Windows
    
    This test uses the test added by commit 5203460c (VS: Add test for
    building MSBuild project in subdir, 2013-01-03) so do not use
    Windows-specific commands.

diff --git a/Tests/VSProjectInSubdir/subdir/CMakeLists.txt b/Tests/VSProjectInSubdir/subdir/CMakeLists.txt
index ff084f3..6c1b6a1 100644
--- a/Tests/VSProjectInSubdir/subdir/CMakeLists.txt
+++ b/Tests/VSProjectInSubdir/subdir/CMakeLists.txt
@@ -1 +1 @@
-add_custom_target(test COMMAND "dir" VERBATIM)
+add_custom_target(test COMMAND ${CMAKE_COMMAND} -E echo test VERBATIM)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57bab2db8156e22a50e2917e0425b5f3ecf6bc81
commit 57bab2db8156e22a50e2917e0425b5f3ecf6bc81
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 9 10:05:46 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 9 10:09:34 2013 -0400

    Xcode: Add projectDir parameter to GenerateBuildCommand
    
    Finish change in commit a5631ce9 (Add projectDir parameter to
    GenerateBuildCommand, 2013-03-21) for Xcode generator.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index ceac564..d898020 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -260,6 +260,7 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
 std::string cmGlobalXCodeGenerator
 ::GenerateBuildCommand(const char* makeProgram,
                        const char *projectName,
+                       const char *projectDir,
                        const char* additionalOptions,
                        const char *targetName,
                        const char* config,
@@ -268,6 +269,7 @@ std::string cmGlobalXCodeGenerator
 {
   // Config is not used yet
   (void) ignoreErrors;
+  (void) projectDir;
 
   // now build the test
   if(makeProgram == 0 || !strlen(makeProgram))
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 131a6e6..fb897b2 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -55,6 +55,7 @@ public:
    */
   virtual std::string GenerateBuildCommand(const char* makeProgram,
                                            const char *projectName,
+                                           const char *projectDir,
                                            const char* additionalOptions,
                                            const char *targetName,
                                            const char* config,

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx             |    2 ++
 Source/cmGlobalXCodeGenerator.h               |    1 +
 Tests/VSProjectInSubdir/subdir/CMakeLists.txt |    2 +-
 3 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake