ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/qt5-base/patches/Qt5BasicConfig.patch

   1 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
   2 index c72989288..a88234dca 100644
   3 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
   4 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
   5 @@ -53,8 +53,12 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
   6      set(_lib_deps)
   7      set(_link_flags)
   8
   9 -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
  10 -    set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
  11 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
  12 +    if(\"${Configuration}\" STREQUAL \"DEBUG\")
  13 +        set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}\")
  14 +    else()
  15 +        set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
  16 +    endif()
  17  !!ELSE
  18      set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
  19  !!ENDIF
  20 @@ -125,6 +129,8 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
  21              elseif(EXISTS \"${_flag}\")
  22                  # The flag is an absolute path to an existing library
  23                  list(APPEND _lib_deps \"${_flag}\")
  24 +            elseif(_flag MATCHES \"\\\\.lib$\") #Library name only. No -l. Probably missing some cases
  25 +                list(APPEND _lib_deps \"${_flag}\")
  26              elseif(_flag MATCHES \"^-L(.*)$\")
  27                  # Handle -Lfoo flags by putting their paths in the search path used by find_library above
  28                  list(APPEND _search_paths \"${CMAKE_MATCH_1}\")
  29 @@ -147,7 +153,11 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
  30      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  31
  32  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
  33 -    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
  34 +    if(\"${Configuration}\" STREQUAL \"DEBUG\") # 1
  35 +        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
  36 +    else()
  37 +        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
  38 +    endif()
  39  !!ELSE
  40      set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
  41  !!ENDIF
  42 @@ -174,21 +184,22 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
  43      )
  44
  45  !!IF !isEmpty(CMAKE_STATIC_TYPE)
  46 -    if(NOT "${IsDebugAndRelease}")
  47 -        set(_genex_condition \"1\")
  48 +    #if(NOT "${IsDebugAndRelease}")
  49 +    #    set(_genex_condition \"1\")
  50 +    #else()
  51 +    if("${Configuration}" STREQUAL "DEBUG")
  52 +        set(_genex_condition \"$<CONFIG:Debug>\")
  53      else()
  54 -        if("${Configuration}" STREQUAL "DEBUG")
  55 -            set(_genex_condition \"$<CONFIG:Debug>\")
  56 -        else()
  57 -            set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
  58 -        endif()
  59 +        set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
  60      endif()
  61 +    #endif()
  62
  63      if(_static_deps)
  64          set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
  65          set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
  66                       \"${_static_deps_genex}\"
  67          )
  68 +        #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static links: ${_static_dep} through ${_static_dep_genex}\") # Added for debugging
  69      endif()
  70
  71      set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\")
  72 @@ -205,13 +216,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
  73              set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
  74                  \"${_static_link_flags_genex}\"
  75              )
  76 +            #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static link flags: ${_static_link_flags} through ${_static_link_flags_genex}\")
  77          endif()
  78      endif()
  79  !!ENDIF
  80
  81  !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
  82  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
  83 -    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  84 +    if(\"${Configuration}\" STREQUAL \"DEBUG\")
  85 +        set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  86 +    else()
  87 +        set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  88 +    endif()
  89  !!ELSE
  90      set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  91  !!ENDIF
  92 @@ -373,13 +389,14 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  93
  94  !!IF !isEmpty(CMAKE_STATIC_TYPE)
  95      if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES)
  96 -!!IF !isEmpty(CMAKE_DEBUG_TYPE)
  97  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
  98 +    if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\")
  99          _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
 100 -            \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
 101 +            \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
 102              _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
 103              _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
 104          )
 105 +    endif()
 106  !!ELSE
 107          _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
 108              \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
 109 @@ -387,22 +404,21 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 110              _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
 111          )
 112  !!ENDIF
 113 -!!ENDIF
 114
 115 -!!IF !isEmpty(CMAKE_RELEASE_TYPE)
 116  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 117 +    if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\")
 118          _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
 119              \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
 120              _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
 121              _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
 122          )
 123 +    endif()
 124  !!ELSE
 125          _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
 126              \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
 127              _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
 128              _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
 129          )
 130 -!!ENDIF
 131  !!ENDIF
 132      endif()
 133
 134 @@ -466,7 +482,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 135  !!IF isEmpty(CMAKE_DEBUG_TYPE)
 136  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
 137  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 138 -    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 139 +    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 140  !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
 141      if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 142  !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
 143 @@ -474,13 +490,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 144  !!ELSE // CMAKE_STATIC_WINDOWS_BUILD
 145      if (EXISTS
 146  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
 147 -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
 148 +        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
 149  !!ELSE
 150          \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
 151  !!ENDIF
 152        AND EXISTS
 153  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 154 -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 155 +        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 156  !!ELSE
 157          \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 158  !!ENDIF
 159 @@ -543,7 +559,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 160          set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
 161
 162  !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
 163 -        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 164 +        if(\"${Configuration}\" STREQUAL \"DEBUG\")
 165 +            set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 166 +        else()
 167 +            set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 168 +        endif()
 169  !!ELSE
 170          set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 171  !!ENDIF
 172 @@ -557,15 +577,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 173              ${_Qt5${Plugin}_STATIC_${Configuration}_LIB_DEPENDENCIES}
 174          )
 175
 176 -        if(NOT "${IsDebugAndRelease}")
 177 -            set(_genex_condition \"1\")
 178 +        #if(NOT "${IsDebugAndRelease}")
 179 +        #    set(_genex_condition \"1\")
 180 +        #else()
 181 +        if("${Configuration}" STREQUAL "DEBUG")
 182 +            set(_genex_condition \"$<CONFIG:Debug>\")
 183          else()
 184 -            if("${Configuration}" STREQUAL "DEBUG")
 185 -                set(_genex_condition \"$<CONFIG:Debug>\")
 186 -            else()
 187 -                set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
 188 -            endif()
 189 +            set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
 190          endif()
 191 +        #endif()
 192          if(_static_deps)
 193              set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
 194              set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES