aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChad Versace <chad@chad.versace.us>2012-08-23 13:53:17 -0700
committerChad Versace <chad@chad.versace.us>2012-08-23 16:12:55 -0700
commita408cfabd5b98ef72e15e1ae62b0e484499411af (patch)
tree8cb45aa0eb628b7fb6fec02b17ddea4c17718c39 /src
parent060d3587db7da69cbb5cf8d635a62fd3d3555edd (diff)
downloadpiglit-a408cfabd5b98ef72e15e1ae62b0e484499411af.tar.gz
cmake,waffle: Bump requirement to waffle>=1.0
If piglit is configured to use waffle, then use pkgconfig to require waffle>=1.0. Also, replace the custom cmake WAFFLE variables with those provided by the pkg_check_modules. Waffle 1.0 moved its header directory from $prefix/include/waffle to $prefix/include/waffle-1. So add '-I $prefix/include/waffle-1' to the CFLAGS and update the #include directives appropriately. Signed-off-by: Chad Versace <chad@chad.versace.us>
Diffstat (limited to 'src')
-rw-r--r--src/glut_waffle/CMakeLists.no_api.txt3
-rw-r--r--src/glut_waffle/glut_waffle.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/glut_waffle/CMakeLists.no_api.txt b/src/glut_waffle/CMakeLists.no_api.txt
index b49965a9..70bd193f 100644
--- a/src/glut_waffle/CMakeLists.no_api.txt
+++ b/src/glut_waffle/CMakeLists.no_api.txt
@@ -1,5 +1,4 @@
-include_directories(${WAFFLE_INCLUDE_DIR})
-link_libraries(${WAFFLE_waffle_LIBRARY})
+link_libraries(${WAFFLE_LIBRARIES})
add_library(glut_waffle SHARED
glut_waffle.c
diff --git a/src/glut_waffle/glut_waffle.c b/src/glut_waffle/glut_waffle.c
index 03590749..83281fd8 100644
--- a/src/glut_waffle/glut_waffle.c
+++ b/src/glut_waffle/glut_waffle.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <EGL/egl.h>
-#include <waffle/waffle.h>
+#include <waffle.h>
extern int piglit_automatic;