Third try to fix issues with graphics on mac
This commit is contained in:
parent
41dc359b50
commit
f940c4fd59
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue