From 64f73b0fb630f3ecc2f94e3e5b4ab2d1cc117f50 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 12 Nov 2013 10:13:15 +0100 Subject: [PATCH] add_library: Fix INTERFACE on platforms with no shared libs (#14561) --- Source/cmAddLibraryCommand.cxx | 1 + Tests/RunCMake/interface_library/RunCMakeTest.cmake | 1 + Tests/RunCMake/interface_library/no_shared_libs-stderr.txt | 1 + Tests/RunCMake/interface_library/no_shared_libs.cmake | 5 +++++ 4 files changed, 8 insertions(+) create mode 100644 Tests/RunCMake/interface_library/no_shared_libs-stderr.txt create mode 100644 Tests/RunCMake/interface_library/no_shared_libs.cmake diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx index 4c591b61b..e9c5d6b76 100644 --- a/Source/cmAddLibraryCommand.cxx +++ b/Source/cmAddLibraryCommand.cxx @@ -229,6 +229,7 @@ bool cmAddLibraryCommand yet its linker language. */ if ((type != cmTarget::STATIC_LIBRARY) && (type != cmTarget::OBJECT_LIBRARY) && + (type != cmTarget::INTERFACE_LIBRARY) && (this->Makefile->GetCMakeInstance()->GetPropertyAsBool( "TARGET_SUPPORTS_SHARED_LIBS") == false)) { diff --git a/Tests/RunCMake/interface_library/RunCMakeTest.cmake b/Tests/RunCMake/interface_library/RunCMakeTest.cmake index 56caf683f..737588836 100644 --- a/Tests/RunCMake/interface_library/RunCMakeTest.cmake +++ b/Tests/RunCMake/interface_library/RunCMakeTest.cmake @@ -2,3 +2,4 @@ include(RunCMake) run_cmake(invalid_name) run_cmake(target_commands) +run_cmake(no_shared_libs) diff --git a/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt new file mode 100644 index 000000000..10f32932e --- /dev/null +++ b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt @@ -0,0 +1 @@ +^$ diff --git a/Tests/RunCMake/interface_library/no_shared_libs.cmake b/Tests/RunCMake/interface_library/no_shared_libs.cmake new file mode 100644 index 000000000..ed81878cb --- /dev/null +++ b/Tests/RunCMake/interface_library/no_shared_libs.cmake @@ -0,0 +1,5 @@ + +cmake_minimum_required(VERSION 2.8.12.20131009) +set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE) +add_library(foo INTERFACE) +target_compile_definitions(foo INTERFACE FOO_DEFINE)