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 95c9df413a1b9348bef03c288bd4bf2c42384ab7 (commit)
via fdc4d2a22ea7ee88619b002abee016ad9020012e (commit)
from f5e5ce4d567844c95185b23071f9c73f771abc19 (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=95c9df413a1b9348bef03c288bd4bf2c42384ab7
commit 95c9df413a1b9348bef03c288bd4bf2c42384ab7
Merge: f5e5ce4 fdc4d2a
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sat Jul 27 05:37:51 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Jul 27 05:37:51 2013 -0400
Merge topic 'fix-export-includes-crash' into next
fdc4d2a Fix crash.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdc4d2a22ea7ee88619b002abee016ad9020012e
commit fdc4d2a22ea7ee88619b002abee016ad9020012e
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sat Jul 27 11:14:56 2013 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sat Jul 27 11:36:43 2013 +0200
Fix crash.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 36802b5..084829d 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -291,7 +291,7 @@ void
cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
{
return;
}
- if (!*input && tei->InterfaceIncludeDirectories.empty())
+ if ((input && !*input) && tei->InterfaceIncludeDirectories.empty())
{
// Set to empty
properties[propName] = "";
diff --git a/Tests/ExportImport/Export/CMakeLists.txt
b/Tests/ExportImport/Export/CMakeLists.txt
index 49f1c58..1910f8c 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -270,6 +270,8 @@ set_property(TARGET cmp0022NEW APPEND PROPERTY
INTERFACE_LINK_LIBRARIES testLib2
set_property(TARGET cmp0022OLD APPEND PROPERTY INTERFACE_LINK_LIBRARIES
testLib2)
set_property(TARGET cmp0022OLD APPEND PROPERTY LINK_INTERFACE_LIBRARIES
testLib3)
+add_library(noIncludesInterface empty.cpp)
+
install(TARGETS testLibRequired
testLibIncludeRequired1
testLibIncludeRequired2
@@ -278,6 +280,7 @@ install(TARGETS testLibRequired
testLibIncludeRequired5
testLibIncludeRequired6
testSharedLibRequired
+ noIncludesInterface
EXPORT RequiredExp DESTINATION lib
INCLUDES DESTINATION
installIncludesTest
diff --git a/Tests/ExportImport/Export/empty.cpp
b/Tests/ExportImport/Export/empty.cpp
new file mode 100644
index 0000000..1787013
--- /dev/null
+++ b/Tests/ExportImport/Export/empty.cpp
@@ -0,0 +1,4 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int empty() { return 0; }
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportFileGenerator.cxx | 2 +-
Tests/ExportImport/Export/CMakeLists.txt | 3 +++
.../Export}/empty.cpp | 0
3 files changed, 4 insertions(+), 1 deletions(-)
copy Tests/{IncludeDirectories => ExportImport/Export}/empty.cpp (100%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
