From: Chris Bieneman Date: Fri, 31 May 2019 17:40:49 +0000 (+0000) Subject: [CMake] Feed BUNDLE_PATH through llvm target wrappers X-Git-Tag: llvmorg-9.0.0-rc1~4098 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c84dafd6b52003d6948dbce20d0df61874c037e;p=platform%2Fupstream%2Fllvm.git [CMake] Feed BUNDLE_PATH through llvm target wrappers This feeds the new llvm_codsign BUNDLE_PATH option through from the llvm target wrapper functions, so that you can specify the BUNDLE_PATH on the target's codesign. llvm-svn: 362248 --- diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 874cc76e8e5f..bd78a9f6783d 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -390,7 +390,7 @@ endfunction(set_windows_version_resource_properties) function(llvm_add_library name) cmake_parse_arguments(ARG "MODULE;SHARED;STATIC;OBJECT;DISABLE_LLVM_LINK_LLVM_DYLIB;SONAME;NO_INSTALL_RPATH" - "OUTPUT_NAME;PLUGIN_TOOL;ENTITLEMENTS" + "OUTPUT_NAME;PLUGIN_TOOL;ENTITLEMENTS;BUNDLE_PATH" "ADDITIONAL_HEADERS;DEPENDS;LINK_COMPONENTS;LINK_LIBS;OBJLIBS" ${ARGN}) list(APPEND LLVM_COMMON_DEPENDS ${ARG_DEPENDS}) @@ -594,7 +594,7 @@ function(llvm_add_library name) if(ARG_SHARED OR ARG_MODULE) llvm_externalize_debuginfo(${name}) - llvm_codesign(${name} ENTITLEMENTS ${ARG_ENTITLEMENTS}) + llvm_codesign(${name} ENTITLEMENTS ${ARG_ENTITLEMENTS} BUNDLE_PATH ${ARG_BUNDLE_PATH}) endif() # clang and newer versions of ninja use high-resolutions timestamps, # but older versions of libtool on Darwin don't, so the archive will @@ -716,7 +716,7 @@ endmacro(add_llvm_library name) macro(add_llvm_executable name) cmake_parse_arguments(ARG "DISABLE_LLVM_LINK_LLVM_DYLIB;IGNORE_EXTERNALIZE_DEBUGINFO;NO_INSTALL_RPATH" - "ENTITLEMENTS" + "ENTITLEMENTS;BUNDLE_PATH" "DEPENDS" ${ARGN}) @@ -798,7 +798,7 @@ macro(add_llvm_executable name) target_link_libraries(${name} PRIVATE ${LLVM_PTHREAD_LIB}) endif() - llvm_codesign(${name} ENTITLEMENTS ${ARG_ENTITLEMENTS}) + llvm_codesign(${name} ENTITLEMENTS ${ARG_ENTITLEMENTS} BUNDLE_PATH ${ARG_BUNDLE_PATH}) endmacro(add_llvm_executable name) function(export_executable_symbols target)