[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6034-g2168d88

[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  2168d88456871fbbbf7f0ca4b27cc30b90e9b871 (commit)
       via  1cd1430b1fb0df91ff97d4ba3f360cdee0f56ce2 (commit)
      from  2e36f07ec2d33ebce0b5222005e0b3e525f0fa53 (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=2168d88456871fbbbf7f0ca4b27cc30b90e9b871
commit 2168d88456871fbbbf7f0ca4b27cc30b90e9b871
Merge: 2e36f07 1cd1430
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 4 08:33:25 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 4 08:33:25 2013 -0500

    Merge topic 'fix-export-segfault' into next
    
    1cd1430 export(): Check targets exist at configure-time (#14608)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cd1430b1fb0df91ff97d4ba3f360cdee0f56ce2
commit 1cd1430b1fb0df91ff97d4ba3f360cdee0f56ce2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Dec 2 17:18:29 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 4 08:30:26 2013 -0500

    export(): Check targets exist at configure-time (#14608)
    
    Commit 66b290e7 (export(): Process the export() command at generate
    time., 2012-10-06 ) refactored export() so that it could evaluate
    strings at generate-time. This was intended for evaluating target
    properties, but that commit also removed a check for target
    existence at configure-time. Restore that check and add a test for
    this case.

diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 86ddc3f..3f6bc2e 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -135,6 +135,14 @@ bool cmExportCommand
         return false;
         }
       }
+    else
+      {
+      cmOStringStream e;
+      e << "given target \"" << *currentTarget
+        << "\" which is not built by this project.";
+      this->SetError(e.str().c_str());
+      return false;
+      }
     }
 
   cmGlobalGenerator *gg = this->Makefile->GetLocalGenerator()
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 209b0b3..407f965 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -98,6 +98,7 @@ add_RunCMake_test(Syntax)
 
 add_RunCMake_test(add_dependencies)
 add_RunCMake_test(build_command)
+add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(find_package)
 add_RunCMake_test(get_filename_component)
diff --git a/Tests/RunCMake/export/CMakeLists.txt b/Tests/RunCMake/export/CMakeLists.txt
new file mode 100644
index 0000000..be9d403
--- /dev/null
+++ b/Tests/RunCMake/export/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST})
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/export/RunCMakeTest.cmake b/Tests/RunCMake/export/RunCMakeTest.cmake
new file mode 100644
index 0000000..b8d3f27
--- /dev/null
+++ b/Tests/RunCMake/export/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(TargetNotFound)
diff --git a/Tests/RunCMake/export/TargetNotFound-result.txt b/Tests/RunCMake/export/TargetNotFound-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/export/TargetNotFound-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/export/TargetNotFound-stderr.txt b/Tests/RunCMake/export/TargetNotFound-stderr.txt
new file mode 100644
index 0000000..944a68e
--- /dev/null
+++ b/Tests/RunCMake/export/TargetNotFound-stderr.txt
@@ -0,0 +1,4 @@
+CMake Error at TargetNotFound.cmake:1 \(export\):
+  export given target "nonexistenttarget" which is not built by this project.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/export/TargetNotFound.cmake b/Tests/RunCMake/export/TargetNotFound.cmake
new file mode 100644
index 0000000..a7c398d
--- /dev/null
+++ b/Tests/RunCMake/export/TargetNotFound.cmake
@@ -0,0 +1 @@
+export(TARGETS nonexistenttarget FILE somefile.cmake)

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

Summary of changes:


hooks/post-receive
-- 
CMake