From f940c4fd59c6ed7fc67ba7321e4952304419d16a Mon Sep 17 00:00:00 2001
From: AurelienUoU <u1235811@lnissrv4.eng.utah.edu>
Date: Wed, 15 May 2019 13:22:14 -0600
Subject: [PATCH] Third try to fix issues with graphics on mac

---
 .travis.yml                 | 2 --
 CMakeLists.txt              | 5 +----
 vpr7_x2p/vpr/CMakeLists.txt | 4 +++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd85d3696..e66b83732 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,8 +50,6 @@ matrix:
           - libxml++2.6-dev
           - perl
           - python
-          - readline	# added to fit Icarus installation requirement
-          - termcap		# added to fit Icarus installation requirement
           - texinfo
           - time
           - valgrind
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 026ff2409..2c3435c8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,11 +22,7 @@ project("OPENFPGA" C CXX)
 
 # Options
 # Option to enable/disable graphic in compilation
-if (APPLE)
-option(ENABLE_VPR_GRAPHICS "Disables VPR graphics" OFF)
-else ()
 option(ENABLE_VPR_GRAPHICS "Enables VPR graphics" ON)
-endif ()
 
 # Version number
 set(OPENFPGA_VERSION_MAJOR 1)
@@ -129,6 +125,7 @@ enable_testing()
 # 
 # Sub-projects
 #
+#add_subdirectory(iverilog)
 add_subdirectory(yosys)
 add_subdirectory(abc)
 add_subdirectory(ace2)
diff --git a/vpr7_x2p/vpr/CMakeLists.txt b/vpr7_x2p/vpr/CMakeLists.txt
index dd36cd222..88da06358 100644
--- a/vpr7_x2p/vpr/CMakeLists.txt
+++ b/vpr7_x2p/vpr/CMakeLists.txt
@@ -12,7 +12,9 @@ endif()
 project("vpr7_x2p" C CXX)
 
 # idenify if we need graphics
-if (ENABLE_VPR_GRAPHICS)
+if (APPLE) 
+  set(ENABLE_VPR_GRAPHICS false)
+elseif (ENABLE_VPR_GRAPHICS)
   # check for dependencies
   message(STATUS "VPR graphics is turned on, searching for dependencies")
   find_package(X11 COMPONENTS X11 Xft)