From ed2d8564f0822115695a024f4e8ece2944e8bb4e Mon Sep 17 00:00:00 2001
From: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Date: Thu, 16 Jan 2020 08:37:07 +0800
Subject: [plplot] fix static build issue (#8817)

---
 ports/plplot/0001-findwxwidgets-fixes.patch | 78 +++++++++++++++++------------
 1 file changed, 45 insertions(+), 33 deletions(-)

(limited to 'ports/plplot/0001-findwxwidgets-fixes.patch')

diff --git a/ports/plplot/0001-findwxwidgets-fixes.patch b/ports/plplot/0001-findwxwidgets-fixes.patch
index 72b1d6c25..cc30ca56d 100644
--- a/ports/plplot/0001-findwxwidgets-fixes.patch
+++ b/ports/plplot/0001-findwxwidgets-fixes.patch
@@ -1,59 +1,71 @@
 diff --git a/cmake/modules/FindwxWidgets.cmake b/cmake/modules/FindwxWidgets.cmake
-index 4d3a2d1..eaaa358 100644
+index 4d3a2d1..c83d8a6 100644
 --- a/cmake/modules/FindwxWidgets.cmake
 +++ b/cmake/modules/FindwxWidgets.cmake
-@@ -515,7 +515,16 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+@@ -515,7 +515,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
          set(_WX_ARCH _x64)
        endif()
      endif()
 -    if(BUILD_SHARED_LIBS)
-+    if(VCPKG_TARGET_TRIPLET)
-+          find_library(wxWidgets_LIB_DIR
-+        NAMES
-+          wxmsw31ud_core.lib
-+          wxmsw31u_core.lib
-+        PATHS
-+        DOC "Path to wxWidgets libraries"
-+        )
-+      get_filename_component(wxWidgets_LIB_DIR ${wxWidgets_LIB_DIR} DIRECTORY)
-+    elseif(BUILD_SHARED_LIBS)
++
++	include(SelectLibraryConfigurations)
++	find_library(wxWidgets_LIB_DIR_LIBRARY_RELEASE NAMES wxmsw31u_core)
++	find_library(wxWidgets_LIB_DIR_LIBRARY_DEBUG NAMES wxmsw31ud_core)
++	select_library_configurations(wxWidgets_LIB_DIR)
++	get_filename_component(wxWidgets_LIB_DIR ${wxWidgets_LIB_DIR} DIRECTORY)
++	if(0)
++	if(BUILD_SHARED_LIBS)
        find_path(wxWidgets_LIB_DIR
          NAMES
            msw/wx/setup.h
-@@ -571,6 +580,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+@@ -554,6 +561,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+         NO_DEFAULT_PATH
+         )
+     endif()
++	endif()
+     unset(_WX_TOOL)
+     unset(_WX_TOOLVER)
+     unset(_WX_ARCH)
+@@ -571,7 +579,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
          set(wxWidgets_DEFINITIONS WXUSINGDLL)
          DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
        endif()
-+      if(VCPKG_TARGET_TRIPLET)
+-
++      if(BUILD_SHARED_LIBS)
 +        set(wxWidgets_DEFINITIONS WXUSINGDLL)
-+      endif(VCPKG_TARGET_TRIPLET)
- 
++      endif(BUILD_SHARED_LIBS)
        # Search for available configuration types.
        foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
-@@ -582,6 +594,15 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
-         endif()
+         set(WX_${CFG}_FOUND FALSE)
+@@ -583,6 +593,13 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
        endforeach()
        DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
-+	  
-+      if(VCPKG_TARGET_TRIPLET)
-+        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-+          set(WX_CONFIGURATION "mswud")
-+        else()
-+          set(WX_CONFIGURATION "mswu")
-+        endif()
-+        set(WX_${WX_CONFIGURATION}_FOUND TRUE)
-+      endif(VCPKG_TARGET_TRIPLET)
  
++      if(CMAKE_BUILD_TYPE STREQUAL "Debug")
++        set(WX_CONFIGURATION "mswud")
++      else()
++        set(WX_CONFIGURATION "mswu")
++      endif()
++      set(WX_${WX_CONFIGURATION}_FOUND TRUE)
++
        if(WX_CONFIGURATION)
          set(wxWidgets_FOUND TRUE)
-@@ -616,7 +637,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+ 
+@@ -616,6 +633,8 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
          WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
  
          # Set wxWidgets lib setup include directory.
--        if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
-+        if(VCPKG_TARGET_TRIPLET)
-+          set(wxWidgets_INCLUDE_DIRS "${wxWidgets_ROOT_DIR}/include")
-+        elseif(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
++        set(wxWidgets_INCLUDE_DIRS "${wxWidgets_ROOT_DIR}/include")
++        if(0)
+         if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
            set(wxWidgets_INCLUDE_DIRS
              ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION})
-         else()
+@@ -623,7 +642,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+           DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.")
+           set(wxWidgets_FOUND FALSE)
+         endif()
+-
++        endif()
+         # Set wxWidgets main include directory.
+         if(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+           list(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include)
-- 
cgit v1.2.3