riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Third try to fix issues with graphics on mac

This commit is contained in:
AurelienUoU 2019-05-15 13:22:14 -06:00
parent 41dc359b50
commit f940c4fd59
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -50,8 +50,6 @@ matrix:
- libxml++2.6-dev - libxml++2.6-dev
- perl - perl
- python - python
- readline # added to fit Icarus installation requirement
- termcap # added to fit Icarus installation requirement
- texinfo - texinfo
- time - time
- valgrind - valgrind

5
CMakeLists.txt
View File

@ -22,11 +22,7 @@ project("OPENFPGA" C CXX)
# Options # Options
# Option to enable/disable graphic in compilation # 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) option(ENABLE_VPR_GRAPHICS "Enables VPR graphics" ON)
endif ()
# Version number # Version number
set(OPENFPGA_VERSION_MAJOR 1) set(OPENFPGA_VERSION_MAJOR 1)
@ -129,6 +125,7 @@ enable_testing()
# #
# Sub-projects # Sub-projects
# #
#add_subdirectory(iverilog)
add_subdirectory(yosys) add_subdirectory(yosys)
add_subdirectory(abc) add_subdirectory(abc)
add_subdirectory(ace2) add_subdirectory(ace2)

4
vpr7_x2p/vpr/CMakeLists.txt
View File

@ -12,7 +12,9 @@ endif()
project("vpr7_x2p" C CXX) project("vpr7_x2p" C CXX)
# idenify if we need graphics # idenify if we need graphics
if (ENABLE_VPR_GRAPHICS) if (APPLE)
set(ENABLE_VPR_GRAPHICS false)
elseif (ENABLE_VPR_GRAPHICS)
# check for dependencies # check for dependencies
message(STATUS "VPR graphics is turned on, searching for dependencies") message(STATUS "VPR graphics is turned on, searching for dependencies")
find_package(X11 COMPONENTS X11 Xft) find_package(X11 COMPONENTS X11 Xft)