[Cmake-commits] CMake branch, next, updated. v2.8.12-4201-g4a9d26b

[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  4a9d26b5eb5f46d9f09cfe5366bddb43fd48ec0d (commit)
       via  9bc39bfc9de89654fb6b965391a4190a4dbc966a (commit)
      from  0c02d8327cf6be5dd364f43790d6d2044e84c3c0 (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=4a9d26b5eb5f46d9f09cfe5366bddb43fd48ec0d
commit 4a9d26b5eb5f46d9f09cfe5366bddb43fd48ec0d
Merge: 0c02d83 9bc39bf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 20 14:54:25 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 20 14:54:25 2013 -0400

    Merge topic 'fix-tll-static-private' into next
    
    9bc39bf Add missing files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bc39bfc9de89654fb6b965391a4190a4dbc966a
commit 9bc39bfc9de89654fb6b965391a4190a4dbc966a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 20 20:53:03 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 20 20:53:24 2013 +0200

    Add missing files.

diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib3.cpp b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib3.cpp
new file mode 100644
index 0000000..570a911
--- /dev/null
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib3.cpp
@@ -0,0 +1,2 @@
+
+int staticlib3() { return 0; }
diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib3.h b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib3.h
new file mode 100644
index 0000000..9c88522
--- /dev/null
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib3.h
@@ -0,0 +1,4 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int staticlib3();

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

Summary of changes:
 .../target_link_libraries/cmp0022/staticlib3.cpp   |    2 ++
 .../cmp0022/{staticlib1.h => staticlib3.h}         |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
 create mode 100644 Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib3.cpp
 copy Tests/CMakeCommands/target_link_libraries/cmp0022/{staticlib1.h => staticlib3.h} (70%)


hooks/post-receive
-- 
CMake