ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/plplot/0001-findwxwidgets-fixes.patch

   1 diff --git a/cmake/modules/FindwxWidgets.cmake b/cmake/modules/FindwxWidgets.cmake
   2 index 4d3a2d1..c83d8a6 100644
   3 --- a/cmake/modules/FindwxWidgets.cmake
   4 +++ b/cmake/modules/FindwxWidgets.cmake
   5 @@ -515,7 +515,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
   6          set(_WX_ARCH _x64)
   7        endif()
   8      endif()
   9 -    if(BUILD_SHARED_LIBS)
  10 +
  11 +       include(SelectLibraryConfigurations)
  12 +       find_library(wxWidgets_LIB_DIR_LIBRARY_RELEASE NAMES wxmsw31u_core)
  13 +       find_library(wxWidgets_LIB_DIR_LIBRARY_DEBUG NAMES wxmsw31ud_core)
  14 +       select_library_configurations(wxWidgets_LIB_DIR)
  15 +       get_filename_component(wxWidgets_LIB_DIR ${wxWidgets_LIB_DIR} DIRECTORY)
  16 +       if(0)
  17 +       if(BUILD_SHARED_LIBS)
  18        find_path(wxWidgets_LIB_DIR
  19          NAMES
  20            msw/wx/setup.h
  21 @@ -554,6 +561,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
  22          NO_DEFAULT_PATH
  23          )
  24      endif()
  25 +       endif()
  26      unset(_WX_TOOL)
  27      unset(_WX_TOOLVER)
  28      unset(_WX_ARCH)
  29 @@ -571,7 +579,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
  30          set(wxWidgets_DEFINITIONS WXUSINGDLL)
  31          DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
  32        endif()
  33 -
  34 +      if(BUILD_SHARED_LIBS)
  35 +        set(wxWidgets_DEFINITIONS WXUSINGDLL)
  36 +      endif(BUILD_SHARED_LIBS)
  37        # Search for available configuration types.
  38        foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
  39          set(WX_${CFG}_FOUND FALSE)
  40 @@ -583,6 +593,13 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
  41        endforeach()
  42        DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
  43
  44 +      if(CMAKE_BUILD_TYPE STREQUAL "Debug")
  45 +        set(WX_CONFIGURATION "mswud")
  46 +      else()
  47 +        set(WX_CONFIGURATION "mswu")
  48 +      endif()
  49 +      set(WX_${WX_CONFIGURATION}_FOUND TRUE)
  50 +
  51        if(WX_CONFIGURATION)
  52          set(wxWidgets_FOUND TRUE)
  53
  54 @@ -616,6 +633,8 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
  55          WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
  56
  57          # Set wxWidgets lib setup include directory.
  58 +        set(wxWidgets_INCLUDE_DIRS "${wxWidgets_ROOT_DIR}/include")
  59 +        if(0)
  60          if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
  61            set(wxWidgets_INCLUDE_DIRS
  62              ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION})
  63 @@ -623,7 +642,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
  64            DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.")
  65            set(wxWidgets_FOUND FALSE)
  66          endif()
  67 -
  68 +        endif()
  69          # Set wxWidgets main include directory.
  70          if(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
  71            list(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include)