[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3329-g6d50566

[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  6d505661d822aeb4d6bfaa1b33497718b319c811 (commit)
       via  ae934141261e351a6008b987e10ce8f9ca9464eb (commit)
      from  b5ac438b4b0d17a52dc97f5d5c47b77b19883ba8 (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=6d505661d822aeb4d6bfaa1b33497718b319c811
commit 6d505661d822aeb4d6bfaa1b33497718b319c811
Merge: b5ac438 ae93414
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 24 11:32:50 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 24 11:32:50 2013 -0400

    Merge topic 'install-interface-includes' into next
    
    ae93414 Print useful error message when signature is ill-formed.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae934141261e351a6008b987e10ce8f9ca9464eb
commit ae934141261e351a6008b987e10ce8f9ca9464eb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 24 17:30:09 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jul 24 17:30:09 2013 +0200

    Print useful error message when signature is ill-formed.

diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 0faf1d4..4649eda 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -295,6 +295,13 @@ 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 520dd44..e582960 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -9,3 +9,4 @@ 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
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/include_directories/TargetInterfaceIncludes-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt b/Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt
new file mode 100644
index 0000000..d153927
--- /dev/null
+++ b/Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..92f31fc
--- /dev/null
+++ b/Tests/RunCMake/include_directories/TargetInterfaceIncludes.cmake
@@ -0,0 +1,4 @@
+
+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}            |    0
 .../TargetInterfaceIncludes-stderr.txt             |    4 ++++
 .../TargetInterfaceIncludes.cmake                  |    4 ++++
 5 files changed, 16 insertions(+), 0 deletions(-)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/TargetInterfaceIncludes-result.txt} (100%)
 create mode 100644 Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt
 create mode 100644 Tests/RunCMake/include_directories/TargetInterfaceIncludes.cmake


hooks/post-receive
-- 
CMake