From e2ddc3e863fd38623eac8f5149ab8368bb62e703 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 23 Mar 2018 21:58:39 +0100
Subject: [PATCH] CMake: Fix GTK3 Win32 build

Add 'BEFORE' to target_include_directories so we include the headers
of the buildin third-party libraries before headers of third-party
libraries included in wxTOOLKIT_INCLUDE_DIRS.
---
 build/cmake/functions.cmake         | 2 +-
 build/cmake/lib/adv/CMakeLists.txt  | 6 +++++-
 build/cmake/lib/aui/CMakeLists.txt  | 2 +-
 build/cmake/lib/core/CMakeLists.txt | 9 +++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 9af05bd939..f699234816 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -378,7 +378,7 @@ macro(wx_lib_include_directories name)
         list(APPEND wxMONO_INCLUDE_DIRS_PUBLIC ${_LIB_INCLUDE_DIRS_PUBLIC})
         list(APPEND wxMONO_INCLUDE_DIRS_PRIVATE ${_LIB_INCLUDE_DIRS_PRIVATE})
     else()
-        target_include_directories(${name};${ARGN})
+        target_include_directories(${name};BEFORE;${ARGN})
     endif()
 endmacro()
 
diff --git a/build/cmake/lib/adv/CMakeLists.txt b/build/cmake/lib/adv/CMakeLists.txt
index 9db332822c..c653d82f55 100644
--- a/build/cmake/lib/adv/CMakeLists.txt
+++ b/build/cmake/lib/adv/CMakeLists.txt
@@ -18,7 +18,11 @@ if(WXMSW)
 elseif(WXOSX_COCOA)
     wx_append_sources(ADV_FILES ADVANCED_OSX_COCOA)
 elseif(WXGTK)
-    wx_append_sources(ADV_FILES ADVANCED_GTK2)
+    if(WXGTK2)
+        wx_append_sources(ADV_FILES ADVANCED_GTK2)
+    else()
+        wx_append_sources(ADV_FILES ADVANCED_GTK)
+    endif()
     wx_append_sources(ADV_FILES ADVANCED_GTK_NATIVE)
 endif()
 
diff --git a/build/cmake/lib/aui/CMakeLists.txt b/build/cmake/lib/aui/CMakeLists.txt
index ba369af670..1ce816a851 100644
--- a/build/cmake/lib/aui/CMakeLists.txt
+++ b/build/cmake/lib/aui/CMakeLists.txt
@@ -13,7 +13,7 @@ wx_append_sources(AUI_FILES AUI_CMN)
 
 if(WXMSW)
     wx_append_sources(AUI_FILES AUI_MSW)
-elseif(WXGTK)
+elseif(WXGTK2)
     wx_append_sources(AUI_FILES AUI_GTK)
 endif()
 
diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt
index 809b50b9b0..d9847854e2 100644
--- a/build/cmake/lib/core/CMakeLists.txt
+++ b/build/cmake/lib/core/CMakeLists.txt
@@ -25,8 +25,13 @@ if(WXMSW)
     wx_append_sources(CORE_SRC MSW)
     wx_append_sources(CORE_SRC MSW_DESKTOP)
 elseif(WXGTK)
-    wx_append_sources(CORE_SRC GTK2_LOWLEVEL)
-    wx_append_sources(CORE_SRC GTK2)
+    if(WXGTK2)
+        wx_append_sources(CORE_SRC GTK2_LOWLEVEL)
+        wx_append_sources(CORE_SRC GTK2)
+    else()
+        wx_append_sources(CORE_SRC GTK_LOWLEVEL)
+        wx_append_sources(CORE_SRC GTK)
+    endif()
 
     wx_append_sources(CORE_SRC XWIN_LOWLEVEL)
 elseif(WXOSX_COCOA)