summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2019-05-24 20:48:08 -0400
committerMarek Olšák <marek.olsak@amd.com>2019-05-24 20:48:12 -0400
commit7d470b78ced0e6db2d32e0aecea3823928abc8e6 (patch)
tree700474b642e81cc09004deabf1de6e30ff41168c
parente1bc6ea6904197b860cc5f811548675ca378b790 (diff)
Revert "cmake: make gbm a required build dependency"
This reverts commit c878a27d0032c6c97f13f84f2a223fafe41e1e63. pushed by accident
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.md4
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2cb1b2d3..b416cacb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-DPIGLIT_HAS_GLX)
endif()
- pkg_check_modules(GBM REQUIRED gbm>=17.1)
+ pkg_check_modules(GBM QUIET gbm>=17.1)
if(GBM_FOUND)
set(PIGLIT_HAS_GBM True)
add_definitions(-DPIGLIT_HAS_GBM)
diff --git a/README.md b/README.md
index 4887678e7..7366893f8 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ First of all, you need to make sure that the following are installed:
- numpy (http://www.numpy.org)
- six (https://pypi.python.org/pypi/six)
- cmake (http://www.cmake.org)
- - GL, gbm, glu and glut libraries and development packages (i.e. headers)
+ - GL, glu and glut libraries and development packages (i.e. headers)
- X11 libraries and development packages (i.e. headers)
- waffle (http://www.waffle-gl.org)
- mako
@@ -97,7 +97,7 @@ flags), then you must invoke cmake with options
Install development packages.
- $ sudo apt-get install cmake g++ mesa-common-dev libgl1-mesa-dev python-numpy python-mako freeglut3-dev x11proto-gl-dev libxrender-dev libwaffle-dev libgbm-dev
+ $ sudo apt-get install cmake g++ mesa-common-dev libgl1-mesa-dev python-numpy python-mako freeglut3-dev x11proto-gl-dev libxrender-dev libwaffle-dev
Configure and build.