[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1743-gd6eeb69

[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  d6eeb699b1b1ad4d34840c9559a309b6ba0a7d61 (commit)
       via  259b6fa5eb5d13cc044a87eede138cc0a98e17d9 (commit)
      from  a758f4c8403d22928320b95e0eddc6935a23b9b4 (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=d6eeb699b1b1ad4d34840c9559a309b6ba0a7d61
commit d6eeb699b1b1ad4d34840c9559a309b6ba0a7d61
Merge: a758f4c 259b6fa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 23 17:29:47 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 23 17:29:47 2013 -0500

    Merge topic 'fix-COMPATIBLE_INTERFACE-link-libraries' into next
    
    259b6fa Use a non-empty file for the shared library.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=259b6fa5eb5d13cc044a87eede138cc0a98e17d9
commit 259b6fa5eb5d13cc044a87eede138cc0a98e17d9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 23 23:28:18 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jan 23 23:29:08 2013 +0100

    Use a non-empty file for the shared library.

diff --git a/Tests/CompatibleInterface/CMakeLists.txt b/Tests/CompatibleInterface/CMakeLists.txt
index 8f74f4f..7280652 100644
--- a/Tests/CompatibleInterface/CMakeLists.txt
+++ b/Tests/CompatibleInterface/CMakeLists.txt
@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.8)
 
 project(CompatibleInterface)
 
+include(GenerateExportHeader)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 add_library(iface1 empty.cpp)
 set_property(TARGET iface1 APPEND PROPERTY
   COMPATIBLE_INTERFACE_BOOL
@@ -28,7 +31,9 @@ target_compile_definitions(CompatibleInterface
     $<$<BOOL:$<TARGET_PROPERTY:BOOL_PROP3>>:BOOL_PROP3>
 )
 
-add_library(iface2 SHARED empty.cpp)
+
+add_library(iface2 SHARED iface2.cpp)
+generate_export_header(iface2)
 
 # For the LINK_LIBRARIES and related properties, we should not evaluate
 # properties defined only in the interface - they should be implicitly zero
diff --git a/Tests/CompatibleInterface/iface2.cpp b/Tests/CompatibleInterface/iface2.cpp
new file mode 100644
index 0000000..a9b5015
--- /dev/null
+++ b/Tests/CompatibleInterface/iface2.cpp
@@ -0,0 +1,7 @@
+
+#include "iface2.h"
+
+int Iface2::foo()
+{
+  return 0;
+}
diff --git a/Tests/CompatibleInterface/iface2.h b/Tests/CompatibleInterface/iface2.h
new file mode 100644
index 0000000..ef4ebee
--- /dev/null
+++ b/Tests/CompatibleInterface/iface2.h
@@ -0,0 +1,13 @@
+
+#ifndef IFACE2_H
+#define IFACE2_H
+
+#include "iface2_export.h"
+
+class IFACE2_EXPORT Iface2
+{
+public:
+  int foo();
+};
+
+#endif
diff --git a/Tests/CompatibleInterface/main.cpp b/Tests/CompatibleInterface/main.cpp
index b7c6638..ae0e985 100644
--- a/Tests/CompatibleInterface/main.cpp
+++ b/Tests/CompatibleInterface/main.cpp
@@ -11,7 +11,10 @@
 #error Expected BOOL_PROP3
 #endif
 
+#include "iface2.h"
+
 int main(int argc, char **argv)
 {
-  return 0;
+  Iface2 if2;
+  return if2.foo();
 }

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

Summary of changes:
 Tests/CompatibleInterface/CMakeLists.txt |    7 ++++++-
 Tests/CompatibleInterface/iface2.cpp     |    7 +++++++
 Tests/CompatibleInterface/iface2.h       |   13 +++++++++++++
 Tests/CompatibleInterface/main.cpp       |    5 ++++-
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 Tests/CompatibleInterface/iface2.cpp
 create mode 100644 Tests/CompatibleInterface/iface2.h


hooks/post-receive
-- 
CMake