cmake/repos/extra-x86_64/wxwidgets-3.2.patch

   1 From ed51e0bb752ecaae29c4ac7a6a89ebfbe5fb4016 Mon Sep 17 00:00:00 2001
   2 From: Maarten Bent <MaartenBent@users.noreply.github.com>
   3 Date: Wed, 15 Jun 2022 18:23:41 +0200
   4 Subject: [PATCH 1/3] FindwxWidgets: Move extracting version number to a macro
   5
   6 ---
   7  Modules/FindwxWidgets.cmake | 44 ++++++++++++++++++++-----------------
   8  1 file changed, 24 insertions(+), 20 deletions(-)
   9
  10 diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
  11 index f7996bacb0..accae50e80 100644
  12 --- a/Modules/FindwxWidgets.cmake
  13 +++ b/Modules/FindwxWidgets.cmake
  14 @@ -215,6 +215,29 @@ else()
  15    set(wxWidgets_USE_FILE UsewxWidgets)
  16  endif()
  17
  18 +macro(wx_extract_version)
  19 +  unset(_wx_filename)
  20 +  find_file(_wx_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH)
  21 +  dbg_msg("_wx_filename:  ${_wx_filename}")
  22 +
  23 +  if(NOT _wx_filename)
  24 +    message(FATAL_ERROR "wxWidgets wx/version.h file not found in ${wxWidgets_INCLUDE_DIRS}.")
  25 +  endif()
  26 +
  27 +  file(READ "${_wx_filename}" _wx_version_h)
  28 +  unset(_wx_filename CACHE)
  29 +
  30 +  string(REGEX REPLACE "^(.*\n)?#define +wxMAJOR_VERSION +([0-9]+).*"
  31 +    "\\2" wxWidgets_VERSION_MAJOR "${_wx_version_h}" )
  32 +  string(REGEX REPLACE "^(.*\n)?#define +wxMINOR_VERSION +([0-9]+).*"
  33 +    "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
  34 +  string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
  35 +    "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
  36 +  set(wxWidgets_VERSION_STRING
  37 +    "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
  38 +  dbg_msg("wxWidgets_VERSION_STRING:    ${wxWidgets_VERSION_STRING}")
  39 +endmacro()
  40 +
  41  #=====================================================================
  42  # Determine whether unix or win32 paths should be used
  43  #=====================================================================
  44 @@ -981,26 +1004,7 @@ unset(_wx_lib_missing)
  45
  46  # Check if a specific version was requested by find_package().
  47  if(wxWidgets_FOUND)
  48 -  unset(_wx_filename)
  49 -  find_file(_wx_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH)
  50 -  dbg_msg("_wx_filename:  ${_wx_filename}")
  51 -
  52 -  if(NOT _wx_filename)
  53 -    message(FATAL_ERROR "wxWidgets wx/version.h file not found in ${wxWidgets_INCLUDE_DIRS}.")
  54 -  endif()
  55 -
  56 -  file(READ "${_wx_filename}" _wx_version_h)
  57 -  unset(_wx_filename CACHE)
  58 -
  59 -  string(REGEX REPLACE "^(.*\n)?#define +wxMAJOR_VERSION +([0-9]+).*"
  60 -    "\\2" wxWidgets_VERSION_MAJOR "${_wx_version_h}" )
  61 -  string(REGEX REPLACE "^(.*\n)?#define +wxMINOR_VERSION +([0-9]+).*"
  62 -    "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
  63 -  string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
  64 -    "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
  65 -  set(wxWidgets_VERSION_STRING
  66 -    "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
  67 -  dbg_msg("wxWidgets_VERSION_STRING:    ${wxWidgets_VERSION_STRING}")
  68 +  wx_extract_version()
  69  endif()
  70
  71  # Debug output:
  72 --
  73 GitLab
  74
  75
  76 From 853449429dec94d64bd0c0cfd41d0104416210df Mon Sep 17 00:00:00 2001
  77 From: Maarten Bent <MaartenBent@users.noreply.github.com>
  78 Date: Wed, 15 Jun 2022 18:26:08 +0200
  79 Subject: [PATCH 2/3] FindwxWidgets: Use version number from header for library
  80  names
  81
  82 ---
  83  Modules/FindwxWidgets.cmake | 47 ++++++++++---------------------------
  84  1 file changed, 12 insertions(+), 35 deletions(-)
  85
  86 diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
  87 index accae50e80..3567a62df0 100644
  88 --- a/Modules/FindwxWidgets.cmake
  89 +++ b/Modules/FindwxWidgets.cmake
  90 @@ -292,10 +292,11 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
  91    #
  92    # Find libraries associated to a configuration.
  93    #
  94 -  macro(WX_FIND_LIBS _PF _UNV _UCD _DBG)
  95 +  macro(WX_FIND_LIBS _PF _UNV _UCD _DBG _VER)
  96      DBG_MSG_V("m_unv = ${_UNV}")
  97      DBG_MSG_V("m_ucd = ${_UCD}")
  98      DBG_MSG_V("m_dbg = ${_DBG}")
  99 +    DBG_MSG_V("m_ver = ${_VER}")
 100
 101      # FIXME: What if both regex libs are available. regex should be
 102      # found outside the loop and only wx${LIB}${_UCD}${_DBG}.
 103 @@ -313,28 +314,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 104
 105      # Find wxWidgets multilib base libraries.
 106      find_library(WX_base${_DBG}
 107 -      NAMES
 108 -      wxbase31${_UCD}${_DBG}
 109 -      wxbase30${_UCD}${_DBG}
 110 -      wxbase29${_UCD}${_DBG}
 111 -      wxbase28${_UCD}${_DBG}
 112 -      wxbase27${_UCD}${_DBG}
 113 -      wxbase26${_UCD}${_DBG}
 114 -      wxbase25${_UCD}${_DBG}
 115 +      NAMES wxbase${_VER}${_UCD}${_DBG}
 116        PATHS ${WX_LIB_DIR}
 117        NO_DEFAULT_PATH
 118        )
 119      mark_as_advanced(WX_base${_DBG})
 120      foreach(LIB net odbc xml)
 121        find_library(WX_${LIB}${_DBG}
 122 -        NAMES
 123 -        wxbase31${_UCD}${_DBG}_${LIB}
 124 -        wxbase30${_UCD}${_DBG}_${LIB}
 125 -        wxbase29${_UCD}${_DBG}_${LIB}
 126 -        wxbase28${_UCD}${_DBG}_${LIB}
 127 -        wxbase27${_UCD}${_DBG}_${LIB}
 128 -        wxbase26${_UCD}${_DBG}_${LIB}
 129 -        wxbase25${_UCD}${_DBG}_${LIB}
 130 +        NAMES wxbase${_VER}${_UCD}${_DBG}_${LIB}
 131          PATHS ${WX_LIB_DIR}
 132          NO_DEFAULT_PATH
 133          )
 134 @@ -343,14 +330,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 135
 136      # Find wxWidgets monolithic library.
 137      find_library(WX_mono${_DBG}
 138 -      NAMES
 139 -      wx${_PF}${_UNV}31${_UCD}${_DBG}
 140 -      wx${_PF}${_UNV}30${_UCD}${_DBG}
 141 -      wx${_PF}${_UNV}29${_UCD}${_DBG}
 142 -      wx${_PF}${_UNV}28${_UCD}${_DBG}
 143 -      wx${_PF}${_UNV}27${_UCD}${_DBG}
 144 -      wx${_PF}${_UNV}26${_UCD}${_DBG}
 145 -      wx${_PF}${_UNV}25${_UCD}${_DBG}
 146 +      NAMES wx${_PF}${_UNV}${_VER}${_UCD}${_DBG}
 147        PATHS ${WX_LIB_DIR}
 148        NO_DEFAULT_PATH
 149        )
 150 @@ -360,14 +340,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 151      foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
 152                  stc ribbon propgrid webview)
 153        find_library(WX_${LIB}${_DBG}
 154 -        NAMES
 155 -        wx${_PF}${_UNV}31${_UCD}${_DBG}_${LIB}
 156 -        wx${_PF}${_UNV}30${_UCD}${_DBG}_${LIB}
 157 -        wx${_PF}${_UNV}29${_UCD}${_DBG}_${LIB}
 158 -        wx${_PF}${_UNV}28${_UCD}${_DBG}_${LIB}
 159 -        wx${_PF}${_UNV}27${_UCD}${_DBG}_${LIB}
 160 -        wx${_PF}${_UNV}26${_UCD}${_DBG}_${LIB}
 161 -        wx${_PF}${_UNV}25${_UCD}${_DBG}_${LIB}
 162 +        NAMES wx${_PF}${_UNV}${_VER}${_UCD}${_DBG}_${LIB}
 163          PATHS ${WX_LIB_DIR}
 164          NO_DEFAULT_PATH
 165          )
 166 @@ -678,10 +651,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 167            set(wxWidgets_FOUND FALSE)
 168          endif()
 169
 170 +        # Get version number.
 171 +        wx_extract_version()
 172 +        set(VER "${wxWidgets_VERSION_MAJOR}${wxWidgets_VERSION_MINOR}")
 173 +
 174          # Find wxWidgets libraries.
 175 -        WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "${DBG}")
 176 +        WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "${DBG}" "${VER}")
 177          if(WX_USE_REL_AND_DBG)
 178 -          WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "d")
 179 +          WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "d" "${VER}")
 180          endif()
 181
 182          # Settings for requested libs (i.e., include dir, libraries, etc.).
 183 --
 184 GitLab
 185
 186
 187 From 2a19231d618482755e9aae981a65680bb1ec1050 Mon Sep 17 00:00:00 2001
 188 From: Maarten Bent <MaartenBent@users.noreply.github.com>
 189 Date: Wed, 15 Jun 2022 18:28:00 +0200
 190 Subject: [PATCH 3/3] FindwxWidgets: Support more wxWidgets versions, including
 191  3.2
 192
 193 Update the example to use a more recent wxWidgets version.
 194
 195 Use a list with known version numbers when searching for installation directories and wx-config names.
 196 ---
 197  Modules/FindwxWidgets.cmake | 58 ++++++++++++-------------------------
 198  1 file changed, 18 insertions(+), 40 deletions(-)
 199
 200 diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
 201 index 3567a62df0..9e7937e2ea 100644
 202 --- a/Modules/FindwxWidgets.cmake
 203 +++ b/Modules/FindwxWidgets.cmake
 204 @@ -29,9 +29,9 @@ select a configuration):
 205  ::
 206
 207    wxWidgets_ROOT_DIR      - Base wxWidgets directory
 208 -                            (e.g., C:/wxWidgets-2.6.3).
 209 +                            (e.g., C:/wxWidgets-3.2.0).
 210    wxWidgets_LIB_DIR       - Path to wxWidgets libraries
 211 -                            (e.g., C:/wxWidgets-2.6.3/lib/vc_lib).
 212 +                            (e.g., C:/wxWidgets-3.2.0/lib/vc_x64_lib).
 213    wxWidgets_CONFIGURATION - Configuration to use
 214                              (e.g., msw, mswd, mswu, mswunivud, etc.)
 215    wxWidgets_EXCLUDE_COMMON_LIBRARIES
 216 @@ -215,6 +215,9 @@ else()
 217    set(wxWidgets_USE_FILE UsewxWidgets)
 218  endif()
 219
 220 +# Known wxWidgets versions.
 221 +set(wx_versions 3.3 3.2 3.1 3.0 2.9 2.8 2.7 2.6 2.5)
 222 +
 223  macro(wx_extract_version)
 224    unset(_wx_filename)
 225    find_file(_wx_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH)
 226 @@ -443,6 +446,13 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 227    # WIN32: Start actual work.
 228    #-------------------------------------------------------------------
 229
 230 +  set(wx_paths "wxWidgets")
 231 +  foreach(version ${wx_versions})
 232 +    foreach(patch RANGE 15 0 -1)
 233 +      list(APPEND wx_paths "wxWidgets-${version}.${patch}")
 234 +    endforeach()
 235 +  endforeach()
 236 +
 237    # Look for an installation tree.
 238    find_path(wxWidgets_ROOT_DIR
 239      NAMES include/wx/wx.h
 240 @@ -454,41 +464,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 241        D:/
 242        ENV ProgramFiles
 243      PATH_SUFFIXES
 244 -      wxWidgets-3.1.0
 245 -      wxWidgets-3.0.2
 246 -      wxWidgets-3.0.1
 247 -      wxWidgets-3.0.0
 248 -      wxWidgets-2.9.5
 249 -      wxWidgets-2.9.4
 250 -      wxWidgets-2.9.3
 251 -      wxWidgets-2.9.2
 252 -      wxWidgets-2.9.1
 253 -      wxWidgets-2.9.0
 254 -      wxWidgets-2.8.9
 255 -      wxWidgets-2.8.8
 256 -      wxWidgets-2.8.7
 257 -      wxWidgets-2.8.6
 258 -      wxWidgets-2.8.5
 259 -      wxWidgets-2.8.4
 260 -      wxWidgets-2.8.3
 261 -      wxWidgets-2.8.2
 262 -      wxWidgets-2.8.1
 263 -      wxWidgets-2.8.0
 264 -      wxWidgets-2.7.4
 265 -      wxWidgets-2.7.3
 266 -      wxWidgets-2.7.2
 267 -      wxWidgets-2.7.1
 268 -      wxWidgets-2.7.0
 269 -      wxWidgets-2.7.0-1
 270 -      wxWidgets-2.6.4
 271 -      wxWidgets-2.6.3
 272 -      wxWidgets-2.6.2
 273 -      wxWidgets-2.6.1
 274 -      wxWidgets-2.5.4
 275 -      wxWidgets-2.5.3
 276 -      wxWidgets-2.5.2
 277 -      wxWidgets-2.5.1
 278 -      wxWidgets
 279 +      ${wx_paths}
 280      DOC "wxWidgets base/installation directory"
 281      )
 282
 283 @@ -773,12 +749,14 @@ else()
 284      # Look for wx-config -- this can be set in the environment,
 285      # or try versioned and toolchain-versioned variants of the -config
 286      # executable as well.
 287 +    set(wx_config_names "wx-config")
 288 +    foreach(version ${wx_versions})
 289 +      list(APPEND wx_config_names "wx-config-${version}" "wxgtk3u-${version}-config" "wxgtk2u-${version}-config")
 290 +    endforeach()
 291      find_program(wxWidgets_CONFIG_EXECUTABLE
 292        NAMES
 293          $ENV{WX_CONFIG}
 294 -        wx-config
 295 -        wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8
 296 -        wxgtk3u-3.1-config wxgtk3u-3.0-config wxgtk2u-2.8-config
 297 +        ${wx_config_names}
 298        DOC "Location of wxWidgets library configuration provider binary (wx-config)."
 299        ONLY_CMAKE_FIND_ROOT_PATH
 300        )
 301 --
 302 GitLab
 303