From 82d6e843bdcbe4548ebab3a73db13d20aa693a3a Mon Sep 17 00:00:00 2001 From: Jenkins for Fcitx 5 Android <102923727+android-fcitx5@users.noreply.github.com> Date: Sun, 5 Feb 2023 15:10:14 +0000 Subject: [PATCH] Auto update --- .../arm64-v8a/lib/cmake/libevent/LibeventConfig.cmake | 6 +++--- .../lib/cmake/libevent/LibeventTargets-static.cmake | 11 ++++++++--- .../lib/cmake/libevent/LibeventConfig.cmake | 6 +++--- .../lib/cmake/libevent/LibeventTargets-static.cmake | 11 ++++++++--- libevent/x86/lib/cmake/libevent/LibeventConfig.cmake | 6 +++--- .../lib/cmake/libevent/LibeventTargets-static.cmake | 11 ++++++++--- .../x86_64/lib/cmake/libevent/LibeventConfig.cmake | 6 +++--- .../lib/cmake/libevent/LibeventTargets-static.cmake | 11 ++++++++--- 8 files changed, 44 insertions(+), 24 deletions(-) diff --git a/libevent/arm64-v8a/lib/cmake/libevent/LibeventConfig.cmake b/libevent/arm64-v8a/lib/cmake/libevent/LibeventConfig.cmake index 8b303967..71859202 100644 --- a/libevent/arm64-v8a/lib/cmake/libevent/LibeventConfig.cmake +++ b/libevent/arm64-v8a/lib/cmake/libevent/LibeventConfig.cmake @@ -118,7 +118,7 @@ if(CONFIG_FOR_INSTALL_TREE) NAMES event2/event.h PATHS "${_INSTALL_PREFIX}/include" NO_DEFAULT_PATH) - if(true) + if(_event_h) set(LIBEVENT_INCLUDE_DIRS "${_event_h}") message_if_needed(STATUS "Found libevent include directory: ${_event_h}") else() @@ -132,7 +132,7 @@ if(CONFIG_FOR_INSTALL_TREE) NAMES "event_${_comp}" PATHS "${_INSTALL_PREFIX}/lib" NO_DEFAULT_PATH) - if(true) + if(_event_lib) list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") set_case_insensitive_found(${_comp}) message_if_needed(STATUS "Found libevent component: ${_event_lib}") @@ -146,7 +146,7 @@ if(CONFIG_FOR_INSTALL_TREE) endforeach() else() ## Config for build tree ---------------------------------------- - set(LIBEVENT_INCLUDE_DIRS "/home/agent/jenkins/workspace/android/prebuilder/libevent/include;/home/agent/jenkins/workspace/android/prebuilder/libevent/build-arm64-v8a/include") + set(LIBEVENT_INCLUDE_DIRS "include") foreach(_comp ${_EVENT_COMPONENTS}) list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") set_case_insensitive_found(${_comp}) diff --git a/libevent/arm64-v8a/lib/cmake/libevent/LibeventTargets-static.cmake b/libevent/arm64-v8a/lib/cmake/libevent/LibeventTargets-static.cmake index bb3750d3..e36f50de 100644 --- a/libevent/arm64-v8a/lib/cmake/libevent/LibeventTargets-static.cmake +++ b/libevent/arm64-v8a/lib/cmake/libevent/LibeventTargets-static.cmake @@ -41,9 +41,14 @@ unset(_targetsNotDefined) unset(_expectedTargets) -# The installation prefix configured by this project. -get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${LIBEVENT_CMAKE_DIR}/../../.." ABSOLUTE) +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() # Create imported target libevent::core add_library(libevent::core STATIC IMPORTED) diff --git a/libevent/armeabi-v7a/lib/cmake/libevent/LibeventConfig.cmake b/libevent/armeabi-v7a/lib/cmake/libevent/LibeventConfig.cmake index aade9281..71859202 100644 --- a/libevent/armeabi-v7a/lib/cmake/libevent/LibeventConfig.cmake +++ b/libevent/armeabi-v7a/lib/cmake/libevent/LibeventConfig.cmake @@ -118,7 +118,7 @@ if(CONFIG_FOR_INSTALL_TREE) NAMES event2/event.h PATHS "${_INSTALL_PREFIX}/include" NO_DEFAULT_PATH) - if(true) + if(_event_h) set(LIBEVENT_INCLUDE_DIRS "${_event_h}") message_if_needed(STATUS "Found libevent include directory: ${_event_h}") else() @@ -132,7 +132,7 @@ if(CONFIG_FOR_INSTALL_TREE) NAMES "event_${_comp}" PATHS "${_INSTALL_PREFIX}/lib" NO_DEFAULT_PATH) - if(true) + if(_event_lib) list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") set_case_insensitive_found(${_comp}) message_if_needed(STATUS "Found libevent component: ${_event_lib}") @@ -146,7 +146,7 @@ if(CONFIG_FOR_INSTALL_TREE) endforeach() else() ## Config for build tree ---------------------------------------- - set(LIBEVENT_INCLUDE_DIRS "/home/agent/jenkins/workspace/android/prebuilder/libevent/include;/home/agent/jenkins/workspace/android/prebuilder/libevent/build-armeabi-v7a/include") + set(LIBEVENT_INCLUDE_DIRS "include") foreach(_comp ${_EVENT_COMPONENTS}) list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") set_case_insensitive_found(${_comp}) diff --git a/libevent/armeabi-v7a/lib/cmake/libevent/LibeventTargets-static.cmake b/libevent/armeabi-v7a/lib/cmake/libevent/LibeventTargets-static.cmake index bb3750d3..e36f50de 100644 --- a/libevent/armeabi-v7a/lib/cmake/libevent/LibeventTargets-static.cmake +++ b/libevent/armeabi-v7a/lib/cmake/libevent/LibeventTargets-static.cmake @@ -41,9 +41,14 @@ unset(_targetsNotDefined) unset(_expectedTargets) -# The installation prefix configured by this project. -get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${LIBEVENT_CMAKE_DIR}/../../.." ABSOLUTE) +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() # Create imported target libevent::core add_library(libevent::core STATIC IMPORTED) diff --git a/libevent/x86/lib/cmake/libevent/LibeventConfig.cmake b/libevent/x86/lib/cmake/libevent/LibeventConfig.cmake index d32ef24d..71859202 100644 --- a/libevent/x86/lib/cmake/libevent/LibeventConfig.cmake +++ b/libevent/x86/lib/cmake/libevent/LibeventConfig.cmake @@ -118,7 +118,7 @@ if(CONFIG_FOR_INSTALL_TREE) NAMES event2/event.h PATHS "${_INSTALL_PREFIX}/include" NO_DEFAULT_PATH) - if(true) + if(_event_h) set(LIBEVENT_INCLUDE_DIRS "${_event_h}") message_if_needed(STATUS "Found libevent include directory: ${_event_h}") else() @@ -132,7 +132,7 @@ if(CONFIG_FOR_INSTALL_TREE) NAMES "event_${_comp}" PATHS "${_INSTALL_PREFIX}/lib" NO_DEFAULT_PATH) - if(true) + if(_event_lib) list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") set_case_insensitive_found(${_comp}) message_if_needed(STATUS "Found libevent component: ${_event_lib}") @@ -146,7 +146,7 @@ if(CONFIG_FOR_INSTALL_TREE) endforeach() else() ## Config for build tree ---------------------------------------- - set(LIBEVENT_INCLUDE_DIRS "/home/agent/jenkins/workspace/android/prebuilder/libevent/include;/home/agent/jenkins/workspace/android/prebuilder/libevent/build-x86/include") + set(LIBEVENT_INCLUDE_DIRS "include") foreach(_comp ${_EVENT_COMPONENTS}) list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") set_case_insensitive_found(${_comp}) diff --git a/libevent/x86/lib/cmake/libevent/LibeventTargets-static.cmake b/libevent/x86/lib/cmake/libevent/LibeventTargets-static.cmake index bb3750d3..e36f50de 100644 --- a/libevent/x86/lib/cmake/libevent/LibeventTargets-static.cmake +++ b/libevent/x86/lib/cmake/libevent/LibeventTargets-static.cmake @@ -41,9 +41,14 @@ unset(_targetsNotDefined) unset(_expectedTargets) -# The installation prefix configured by this project. -get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${LIBEVENT_CMAKE_DIR}/../../.." ABSOLUTE) +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() # Create imported target libevent::core add_library(libevent::core STATIC IMPORTED) diff --git a/libevent/x86_64/lib/cmake/libevent/LibeventConfig.cmake b/libevent/x86_64/lib/cmake/libevent/LibeventConfig.cmake index 63122370..71859202 100644 --- a/libevent/x86_64/lib/cmake/libevent/LibeventConfig.cmake +++ b/libevent/x86_64/lib/cmake/libevent/LibeventConfig.cmake @@ -118,7 +118,7 @@ if(CONFIG_FOR_INSTALL_TREE) NAMES event2/event.h PATHS "${_INSTALL_PREFIX}/include" NO_DEFAULT_PATH) - if(true) + if(_event_h) set(LIBEVENT_INCLUDE_DIRS "${_event_h}") message_if_needed(STATUS "Found libevent include directory: ${_event_h}") else() @@ -132,7 +132,7 @@ if(CONFIG_FOR_INSTALL_TREE) NAMES "event_${_comp}" PATHS "${_INSTALL_PREFIX}/lib" NO_DEFAULT_PATH) - if(true) + if(_event_lib) list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") set_case_insensitive_found(${_comp}) message_if_needed(STATUS "Found libevent component: ${_event_lib}") @@ -146,7 +146,7 @@ if(CONFIG_FOR_INSTALL_TREE) endforeach() else() ## Config for build tree ---------------------------------------- - set(LIBEVENT_INCLUDE_DIRS "/home/agent/jenkins/workspace/android/prebuilder/libevent/include;/home/agent/jenkins/workspace/android/prebuilder/libevent/build-x86_64/include") + set(LIBEVENT_INCLUDE_DIRS "include") foreach(_comp ${_EVENT_COMPONENTS}) list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") set_case_insensitive_found(${_comp}) diff --git a/libevent/x86_64/lib/cmake/libevent/LibeventTargets-static.cmake b/libevent/x86_64/lib/cmake/libevent/LibeventTargets-static.cmake index bb3750d3..e36f50de 100644 --- a/libevent/x86_64/lib/cmake/libevent/LibeventTargets-static.cmake +++ b/libevent/x86_64/lib/cmake/libevent/LibeventTargets-static.cmake @@ -41,9 +41,14 @@ unset(_targetsNotDefined) unset(_expectedTargets) -# The installation prefix configured by this project. -get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${LIBEVENT_CMAKE_DIR}/../../.." ABSOLUTE) +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() # Create imported target libevent::core add_library(libevent::core STATIC IMPORTED)