From d92aac0dcf0004e1ac3a28eaf3a7743bd29ef4ed Mon Sep 17 00:00:00 2001
From: pradeep <pradeep@arrayfire.com>
Date: Tue, 20 Mar 2018 12:18:24 +0530
Subject: [PATCH 1/2] refactor: merge cmake static c++ lib flags options

Earlier, there were two separate flags. From, now on
just FG_USE_STATIC_CPPFLAGS would suffice
---
 CMakeLists.txt                    | 9 +++------
 examples/CMakeLists.txt           | 2 +-
 src/backend/opengl/CMakeLists.txt | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c442f9f..10af8762 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,18 +75,15 @@ option(FG_WITH_FREEIMAGE
 
 option(FG_USE_STATIC_FREEIMAGE
     "Use static version of freeimage" OFF)
-option(FG_USE_STATIC_STDCPP
-    "Use static libstdc++ for generating forge library" OFF)
-option(FG_USE_STATIC_GCC
-    "Use static libgcc for generating forge library" OFF)
+option(FG_USE_STATIC_CPPFLAGS
+    "Use static libstdc++ & libgcc for generating forge library" OFF)
 
 set(FG_USE_WINDOW_TOOLKIT "glfw3" CACHE STRING "Choose Window toolkit")
 set_property(CACHE FG_USE_WINDOW_TOOLKIT PROPERTY STRINGS "glfw3" "sdl2")
 
 mark_as_advanced(
     FG_USE_STATIC_FREEIMAGE
-    FG_USE_STATIC_STDCPP
-    FG_USE_STATIC_GCC
+    FG_USE_STATIC_CPPFLAGS
     )
 
 fg_deprecate(BUILD_DOCS FG_BUILD_DOCS)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 47c210e0..3380f959 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package(OpenGL REQUIRED)
 find_package(CUDA QUIET)
 
 if(APPLE)
-    find_package(X11)
+    find_package(X11 REQUIRED)
     if(X11_FOUND AND NOT TARGET X11::x11)
         add_library(X11::x11 UNKNOWN IMPORTED)
         set_target_properties(X11::x11 PROPERTIES
diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt
index 5d95f370..9dd06efd 100755
--- a/src/backend/opengl/CMakeLists.txt
+++ b/src/backend/opengl/CMakeLists.txt
@@ -107,8 +107,8 @@ if(UNIX)
     PRIVATE
       FontConfig::FontConfig
       ${X11_X11_LIB}
-      $<$<AND:$<CXX_COMPILER_ID:GNU>,$<BOOL:${FG_USE_STATIC_STDCPP}>>:-static-libstdc++>
-      $<$<AND:$<C_COMPILER_ID:GNU>,$<BOOL:${FG_USE_STATIC_GCC}>>:-static-libgcc>
+      $<$<AND:$<CXX_COMPILER_ID:GNU>,$<BOOL:${FG_USE_STATIC_CPPFLAGS}>>:-static-libstdc++>
+      $<$<AND:$<C_COMPILER_ID:GNU>,$<BOOL:${FG_USE_STATIC_CPPFLAGS}>>:-static-libgcc>
   )
 endif(UNIX)
 

From 1810e905b509004c3f92534e748b4f14d71a3be1 Mon Sep 17 00:00:00 2001
From: pradeep <pradeep@arrayfire.com>
Date: Tue, 20 Mar 2018 12:19:52 +0530
Subject: [PATCH 2/2] fix: remove obsolete dependency, x11

---
 CMakeLists.txt                    | 1 -
 src/backend/opengl/CMakeLists.txt | 2 --
 2 files changed, 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10af8762..45eb7ccb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,6 @@ endif()
 
 #packages not available via hunter
 find_package(Doxygen    QUIET)
-find_package(X11        QUIET)
 find_package(FreeImage  QUIET)
 if(UNIX)
     find_package(FontConfig REQUIRED)
diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt
index 9dd06efd..9a6316e3 100755
--- a/src/backend/opengl/CMakeLists.txt
+++ b/src/backend/opengl/CMakeLists.txt
@@ -85,7 +85,6 @@ target_include_directories(${BackendTarget}
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${PROJECT_BINARY_DIR}
         ${PROJECT_SOURCE_DIR}/include
-        ${X11_INCLUDE_DIR}
     )
 
 target_link_libraries(${BackendTarget}
@@ -106,7 +105,6 @@ if(UNIX)
   target_link_libraries(${BackendTarget}
     PRIVATE
       FontConfig::FontConfig
-      ${X11_X11_LIB}
       $<$<AND:$<CXX_COMPILER_ID:GNU>,$<BOOL:${FG_USE_STATIC_CPPFLAGS}>>:-static-libstdc++>
       $<$<AND:$<C_COMPILER_ID:GNU>,$<BOOL:${FG_USE_STATIC_CPPFLAGS}>>:-static-libgcc>
   )