[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3458-g6a1d2e8

[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  6a1d2e81fffa624cc76612081837759f92118197 (commit)
       via  72d13ff4826ff3e120fe2d052495b0806c2a5b90 (commit)
      from  1222f937e14b2a6087bf95e7a7b6e7c008ee7fdb (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=6a1d2e81fffa624cc76612081837759f92118197
commit 6a1d2e81fffa624cc76612081837759f92118197
Merge: 1222f93 72d13ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 29 09:24:49 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 29 09:24:49 2013 -0400

    Merge topic 'install-interface-includes' into next
    
    72d13ff install: Remove error condition using INCLUDES DESTINATION without EXPORT.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72d13ff4826ff3e120fe2d052495b0806c2a5b90
commit 72d13ff4826ff3e120fe2d052495b0806c2a5b90
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 29 15:16:15 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jul 29 15:16:15 2013 +0200

    install: Remove error condition using INCLUDES DESTINATION without EXPORT.
    
    Commit 650e61f8 (Add a convenient way to add the includes install
    dir to the INTERFACE., 2013-01-05) introduced an error case for
    using the install(TARGETS) command with specified INCLUDES DESTINATION,
    but no specified EXPORT set.
    
    It is convenient to use a variable to set the various destinations
    for different outputs (as KDE does), and some targets such as
    executables are installed but not exported. This was triggering
    the error case, but as it is a common case, remove the error.

diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 4649eda..0faf1d4 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -295,13 +295,6 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
     return false;
     }
 
-  if(!includesArgs.GetIncludeDirs().empty() && exports.GetString().empty())
-    {
-    this->SetError("TARGETS given INCLUDES DESTINATION, but EXPORT set "
-      "not specified.");
-    return false;
-    }
-
   // Enforce argument rules too complex to specify for the
   // general-purpose parser.
   if(archiveArgs.GetNamelinkOnly() ||
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index e582960..520dd44 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -9,4 +9,3 @@ run_cmake(RelativePathInInterface)
 run_cmake(ImportedTarget)
 run_cmake(RelativePathInGenex)
 run_cmake(CMP0021)
-run_cmake(TargetInterfaceIncludes)
diff --git a/Tests/RunCMake/include_directories/TargetInterfaceIncludes-result.txt b/Tests/RunCMake/include_directories/TargetInterfaceIncludes-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/include_directories/TargetInterfaceIncludes-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt b/Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt
deleted file mode 100644
index d153927..0000000
--- a/Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-CMake Error at TargetInterfaceIncludes.cmake:3 \(install\):
-  install TARGETS given INCLUDES DESTINATION, but EXPORT set not specified.
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/include_directories/TargetInterfaceIncludes.cmake b/Tests/RunCMake/include_directories/TargetInterfaceIncludes.cmake
deleted file mode 100644
index 92f31fc..0000000
--- a/Tests/RunCMake/include_directories/TargetInterfaceIncludes.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-add_library(empty empty.cpp)
-install(TARGETS empty DESTINATION lib INCLUDES DESTINATION include)
-# install(EXPORT )

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

Summary of changes:
 Source/cmInstallCommand.cxx                        |    7 -------
 .../include_directories/RunCMakeTest.cmake         |    1 -
 .../TargetInterfaceIncludes-result.txt             |    1 -
 .../TargetInterfaceIncludes-stderr.txt             |    4 ----
 .../TargetInterfaceIncludes.cmake                  |    4 ----
 5 files changed, 0 insertions(+), 17 deletions(-)
 delete mode 100644 Tests/RunCMake/include_directories/TargetInterfaceIncludes-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/TargetInterfaceIncludes.cmake


hooks/post-receive
-- 
CMake