[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3419-g801dba4

[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  801dba4c032b882f64bf94733095e13d3d4eec96 (commit)
       via  76712a017479b9b5f3b4f67a38c5a1ae90e340fd (commit)
      from  2f375754b671a3c705b0066d1c1811fc60d9e9f7 (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=801dba4c032b882f64bf94733095e13d3d4eec96
commit 801dba4c032b882f64bf94733095e13d3d4eec96
Merge: 2f37575 76712a0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 09:15:36 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 26 09:15:36 2013 -0400

    Merge topic 'minor-cleanups' into next
    
    76712a0 Add missing files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76712a017479b9b5f3b4f67a38c5a1ae90e340fd
commit 76712a017479b9b5f3b4f67a38c5a1ae90e340fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 15:15:13 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 26 15:15:13 2013 +0200

    Add missing files.

diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.cpp b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.cpp
new file mode 100644
index 0000000..a253c46
--- /dev/null
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.cpp
@@ -0,0 +1,2 @@
+
+int staticlib1() { return 0; }
diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.h b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.h
new file mode 100644
index 0000000..4bbf23f
--- /dev/null
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.h
@@ -0,0 +1,4 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int staticlib1();
diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.cpp b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.cpp
new file mode 100644
index 0000000..4e38063
--- /dev/null
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.cpp
@@ -0,0 +1,2 @@
+
+int staticlib2() { return 0; }
diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.h b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.h
new file mode 100644
index 0000000..a4e07b6
--- /dev/null
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.h
@@ -0,0 +1,4 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int staticlib2();
diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib_exe.cpp b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib_exe.cpp
new file mode 100644
index 0000000..97adc40
--- /dev/null
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib_exe.cpp
@@ -0,0 +1,8 @@
+
+#include "staticlib1.h"
+#include "staticlib2.h"
+
+int main()
+{
+  return staticlib1() + staticlib2();
+}

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

Summary of changes:
 .../target_link_libraries/cmp0022/staticlib1.cpp   |    2 ++
 .../target_link_libraries/cmp0022/staticlib1.h}    |    2 +-
 .../target_link_libraries/cmp0022/staticlib2.cpp   |    2 ++
 .../target_link_libraries/cmp0022/staticlib2.h}    |    2 +-
 .../cmp0022/staticlib_exe.cpp                      |    8 ++++++++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.cpp
 copy Tests/{InterfaceLinkLibraries/bang.h => CMakeCommands/target_link_libraries/cmp0022/staticlib1.h} (70%)
 create mode 100644 Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.cpp
 copy Tests/{InterfaceLinkLibraries/bang.h => CMakeCommands/target_link_libraries/cmp0022/staticlib2.h} (70%)
 create mode 100644 Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib_exe.cpp


hooks/post-receive
-- 
CMake