Merge branch 'master' of github.com:cginternals/glbinding

Author: scheibel

README.md

@@ -129,9 +129,9 @@ Building *glbinding* from source has several mandatory and optional dependencies
 * [CMake](https://cmake.org/) 3.0 or higher for building *glbinding* from source (mandatory for any build from source)
 * [git](https://git-scm.com/) for version control and script supporting tasks
 * [GLFW](http://www.glfw.org/) 3.2 or higher for examples and tools
-* [GLEW](http://glew.sourceforge.net/) 1.6 or higher for the comparison example
-* [cpplocate](https://github.com/cginternals/cpplocate) for the examples
-* [Qt5](http://www.qt.io/developers/) 5.0 or higher for the qt-based example
+* [GLEW](http://glew.sourceforge.net/) 1.6 or higher for the comparison example (optional)
+* [cpplocate](https://github.com/cginternals/cpplocate) for the examples (optional)
+* [Qt5](http://www.qt.io/developers/) 5.0 or higher for the qt-based example (optional)
 * [Doxygen](http://www.stack.nl/~dimitri/doxygen/) 1.8 or higher for generating the documentation on your system
   * [graphviz](http://www.graphviz.org/) for generating diagrams (optional)
 

deploy/ubuntu-ppa/debian/control

@@ -2,7 +2,7 @@ Source: libglbinding
 Section: misc
 Priority: optional
 Maintainer: Willy Scheibel <willy.scheibel@cginternals.com>
-Build-Depends: build-essential, cmake, libgl1-mesa-dev, libglfw3-dev, libcpplocate-dev, libcpplocate-dbg, qtbase5-dev, doxygen, graphviz
+Build-Depends: build-essential, cmake, libgl1-mesa-dev, libglfw3-dev, libcpplocate-dev, libcpplocate-dbg, qtbase5-dev, doxygen, graphviz, libx11-dev, libxrandr-dev, libxinerama-dev, libxcursor-dev
 Standards-Version: 3.8.0
 
 Package: libglbinding

source/CMakeLists.txt

@@ -44,4 +44,4 @@ endif()
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_NAME} DESTINATION include COMPONENT dev)
 
 
-include("${CMAKE_SOURCE_DIR}/cmake/WinInstallHacks.cmake")
+include(${PROJECT_SOURCE_DIR}/cmake/WinInstallHacks.cmake)

source/examples/cubescape-qt/CMakeLists.txt

@@ -32,6 +32,12 @@ if (NOT Qt5Core_FOUND)
     return()
 endif()
 
+# On macOS qt5 fails to link against opengl
+if(APPLE)
+    find_package(OpenGL     REQUIRED)
+endif()
+
+
 if (NOT cpplocate_FOUND)
     message(STATUS "Example ${target}: using static data path (cpplocate not found)")
 else()
@@ -115,7 +121,8 @@ target_link_libraries(${target}
     Qt5::Core
     Qt5::Gui
     Qt5::Widgets
-    $<$<BOOL:${cpplocate_FOUND}>:cpplocate::cpplocate>
+    "$<$<BOOL:${cpplocate_FOUND}>:cpplocate::cpplocate>"
+    "$<$<PLATFORM_ID:Darwin>:${OPENGL_gl_LIBRARY}>"
 )
 
 

source/glbinding/include/glbinding/glbinding.h

@@ -3,6 +3,7 @@
 
 
 #include <set>
+#include <string>
 #include <vector>
 #include <functional>