summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Naumann <Axel.Naumann@cern.ch>2016-01-12 07:44:58 +0000
committerAxel Naumann <Axel.Naumann@cern.ch>2016-01-12 07:44:58 +0000
commitb457beb376fbf33ab29a1474810edfbed7922868 (patch)
tree121e04cc1550f53b74f8f4a932150564cfaf9f8a
parentaf1d1a4f04e9388df36d9573ebdda8b263538491 (diff)
downloadbcm5719-llvm-b457beb376fbf33ab29a1474810edfbed7922868.tar.gz
bcm5719-llvm-b457beb376fbf33ab29a1474810edfbed7922868.zip
Explicitly enable OBJECT library "target".
With this, one can build a lib from the objects of other libs: set(SOURCES $<TARGET_OBJECTS:obj.clingInterpreter> $<TARGET_OBJECTS:obj.clingMetaProcessor> $<TARGET_OBJECTS:obj.clingUtils> ) Reviewed by Chris Bieneman - thanks! llvm-svn: 257459
-rw-r--r--llvm/cmake/modules/AddLLVM.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index bed81b28426..b06e434a248 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/cmake/modules/AddLLVM.cmake
@@ -308,6 +308,8 @@ endfunction(set_windows_version_resource_properties)
# SHARED;STATIC
# STATIC by default w/o BUILD_SHARED_LIBS.
# SHARED by default w/ BUILD_SHARED_LIBS.
+# OBJECT
+# Also create an OBJECT library target. Default if STATIC && SHARED.
# MODULE
# Target ${name} might not be created on unsupported platforms.
# Check with "if(TARGET ${name})".
@@ -329,7 +331,7 @@ endfunction(set_windows_version_resource_properties)
# )
function(llvm_add_library name)
cmake_parse_arguments(ARG
- "MODULE;SHARED;STATIC;DISABLE_LLVM_LINK_LLVM_DYLIB;SONAME"
+ "MODULE;SHARED;STATIC;OBJECT;DISABLE_LLVM_LINK_LLVM_DYLIB;SONAME"
"OUTPUT_NAME"
"ADDITIONAL_HEADERS;DEPENDS;LINK_COMPONENTS;LINK_LIBS;OBJLIBS"
${ARGN})
@@ -362,7 +364,7 @@ function(llvm_add_library name)
endif()
# Generate objlib
- if(ARG_SHARED AND ARG_STATIC)
+ if((ARG_SHARED AND ARG_STATIC) OR ARG_OBJECT)
# Generate an obj library for both targets.
set(obj_name "obj.${name}")
add_library(${obj_name} OBJECT EXCLUDE_FROM_ALL
OpenPOWER on IntegriCloud