From 348e55974bbb055d24475d56d91d41c00655ffc1 Mon Sep 17 00:00:00 2001 From: Daniel Limberger Date: Thu, 25 Apr 2019 09:10:59 +0200 Subject: [PATCH 1/4] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a67ce0b5b..0bf70ee1f 100644 --- a/README.md +++ b/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) From 5c56c39c07760cbf22f1b9f703861cff6d29f5cf Mon Sep 17 00:00:00 2001 From: Willy Scheibel Date: Thu, 25 Apr 2019 15:38:27 +0200 Subject: [PATCH 2/4] Adjust dependencies for PPA --- deploy/ubuntu-ppa/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/ubuntu-ppa/debian/control b/deploy/ubuntu-ppa/debian/control index f55c0ad49..21c0c9411 100755 --- a/deploy/ubuntu-ppa/debian/control +++ b/deploy/ubuntu-ppa/debian/control @@ -2,7 +2,7 @@ Source: libglbinding Section: misc Priority: optional Maintainer: Willy Scheibel -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 From c1f43e0231305b70e26650b173f3baad88246a3e Mon Sep 17 00:00:00 2001 From: Zangetsu38 Date: Thu, 25 Apr 2019 04:30:55 +0200 Subject: [PATCH 3/4] Fix Visual studio 2019 compile. Fix path wrong for include WinInstallHacks --- source/CMakeLists.txt | 2 +- source/glbinding/include/glbinding/glbinding.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 601a3fe5f..fc52d635c 100644 --- a/source/CMakeLists.txt +++ b/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) diff --git a/source/glbinding/include/glbinding/glbinding.h b/source/glbinding/include/glbinding/glbinding.h index 48caaae0d..f595b6c38 100644 --- a/source/glbinding/include/glbinding/glbinding.h +++ b/source/glbinding/include/glbinding/glbinding.h @@ -3,6 +3,7 @@ #include +#include #include #include From f4971aa1eb8cbbd08a17129f8c16d996f5bcda53 Mon Sep 17 00:00:00 2001 From: Daniel Limberger Date: Fri, 26 Apr 2019 10:00:00 +0200 Subject: [PATCH 4/4] fix macos build --- source/examples/cubescape-qt/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/examples/cubescape-qt/CMakeLists.txt b/source/examples/cubescape-qt/CMakeLists.txt index 405b2485a..6bf73f56a 100644 --- a/source/examples/cubescape-qt/CMakeLists.txt +++ b/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 - $<$:cpplocate::cpplocate> + "$<$:cpplocate::cpplocate>" + "$<$:${OPENGL_gl_LIBRARY}>" )