[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1545-g71e4d7b

[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  71e4d7b9c2ed0695f7d2e6c28aff41c41063a4ad (commit)
       via  96cce6477cb310825e8b4413e6891dcf02ab1fbe (commit)
      from  5dcfc38994547a5cee5d8c699a73c6aecb79877b (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=71e4d7b9c2ed0695f7d2e6c28aff41c41063a4ad
commit 71e4d7b9c2ed0695f7d2e6c28aff41c41063a4ad
Merge: 5dcfc38 96cce64
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 10 12:30:59 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 10 12:30:59 2013 -0500

    Merge topic 'LINK_INTERFACE_LIBRARIES-genex' into next
    
    96cce64 Remove the testLibLibraryRequired library.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96cce6477cb310825e8b4413e6891dcf02ab1fbe
commit 96cce6477cb310825e8b4413e6891dcf02ab1fbe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 10 18:26:05 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 10 18:29:03 2013 +0100

    Remove the testLibLibraryRequired library.
    
    It is a C++ library, but gets linked to a C executable on Import,
    which breaks.
    
    The more useful test is the shared library test anyway, which tests
    generator expressions in IMPORTED_LINK_INTERFACE_LIBRARIES.

diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index 3e8b912..4f283b7 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -149,7 +149,6 @@ set_property(TARGET testLibRequired APPEND PROPERTY
     $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired4,INTERFACE_INCLUDE_DIRECTORIES>>
     $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired5,INTERFACE_INCLUDE_DIRECTORIES>>
     $<INSTALL_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired6,INTERFACE_INCLUDE_DIRECTORIES>>
-    $<TARGET_PROPERTY:testLibLibraryRequired,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 set_property(TARGET testLibRequired APPEND PROPERTY
@@ -160,15 +159,6 @@ set_property(TARGET testLibRequired APPEND PROPERTY
 )
 
 include(GenerateExportHeader)
-add_library(testLibLibraryRequired SHARED testLibLibraryRequired.cpp)
-generate_export_header(testLibLibraryRequired)
-set_property(TARGET testLibLibraryRequired APPEND PROPERTY
-  INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}"
-)
-set_property(TARGET testLibLibraryRequired APPEND PROPERTY
-  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}"
-                                "${CMAKE_CURRENT_SOURCE_DIR}"
-)
 
 add_library(testSharedLibRequired SHARED testSharedLibRequired.cpp)
 generate_export_header(testSharedLibRequired)
@@ -202,7 +192,6 @@ install(TARGETS testLibRequired
                 testLibIncludeRequired4
                 testLibIncludeRequired5
                 testLibIncludeRequired6
-                testLibLibraryRequired
                 testSharedLibRequired
         EXPORT RequiredExp DESTINATION lib )
 install(EXPORT RequiredExp NAMESPACE Req:: FILE testLibRequiredConfig.cmake DESTINATION lib/cmake/testLibRequired)
diff --git a/Tests/ExportImport/Export/testLibLibraryRequired.cpp b/Tests/ExportImport/Export/testLibLibraryRequired.cpp
deleted file mode 100644
index 4d48a26..0000000
--- a/Tests/ExportImport/Export/testLibLibraryRequired.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "testLibLibraryRequired.h"
-
-int TestLibLibraryRequired::foo()
-{
-  return 0;
-}
diff --git a/Tests/ExportImport/Export/testLibLibraryRequired.h b/Tests/ExportImport/Export/testLibLibraryRequired.h
deleted file mode 100644
index 89bc945..0000000
--- a/Tests/ExportImport/Export/testLibLibraryRequired.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#ifndef TESTLIBLIBRARYREQUIRED_H
-#define TESTLIBLIBRARYREQUIRED_H
-
-#include "testliblibraryrequired_export.h"
-
-struct TESTLIBLIBRARYREQUIRED_EXPORT TestLibLibraryRequired
-{
-  int foo();
-};
-
-#endif
diff --git a/Tests/ExportImport/Import/A/deps_iface.c b/Tests/ExportImport/Import/A/deps_iface.c
index 91c42fe..e73ca26 100644
--- a/Tests/ExportImport/Import/A/deps_iface.c
+++ b/Tests/ExportImport/Import/A/deps_iface.c
@@ -3,8 +3,6 @@
 #include "testLibIncludeRequired2.h"
 #include "testLibIncludeRequired6.h"
 
-#include "testLibLibraryRequired.h"
-
 #ifndef testLibRequired_IFACE_DEFINE
 #error Expected testLibRequired_IFACE_DEFINE
 #endif
@@ -22,7 +20,5 @@ extern int testLibDepends(void);
 
 int main()
 {
-  TestLibLibraryRequired ifaceDep;
-
-  return testLibDepends() + ifaceDep.foo();
+  return testLibDepends();
 }

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

Summary of changes:
 Tests/ExportImport/Export/CMakeLists.txt           |   11 -----------
 .../ExportImport/Export/testLibLibraryRequired.cpp |    7 -------
 Tests/ExportImport/Export/testLibLibraryRequired.h |   12 ------------
 Tests/ExportImport/Import/A/deps_iface.c           |    6 +-----
 4 files changed, 1 insertions(+), 35 deletions(-)
 delete mode 100644 Tests/ExportImport/Export/testLibLibraryRequired.cpp
 delete mode 100644 Tests/ExportImport/Export/testLibLibraryRequired.h


hooks/post-receive
-- 
CMake