From 60af013668cc8850f2201b258712dac951dd8180 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sun, 6 Sep 2020 19:10:46 +0200 Subject: [PATCH 1/2] add Findglm.cmake to find glm.hpp Because "glm" removed an install support from the cmake there since version 0.9.9.6. --- Findglm.cmake | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Findglm.cmake diff --git a/Findglm.cmake b/Findglm.cmake new file mode 100644 index 0000000..a21f4ea --- /dev/null +++ b/Findglm.cmake @@ -0,0 +1,25 @@ +#.rst: +# Findglm +# ------------ +# Finds the OpenGL Mathematics (GLM) as a header only C++ mathematics library. +# +# This will define the following variables: +# +# GLM_FOUND - system has OpenGLES +# GLM_INCLUDE_DIR - the OpenGLES include directory +# +# Note: Install was removed from GLM on version 0.9.9.6. + +find_package(PkgConfig) +if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_GLM glm QUIET) +endif() + +find_path(GLM_INCLUDE_DIR glm.hpp + PATHS ${PC_GLM_INCLUDEDIR} + PATH_SUFFIXES glm) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(glm REQUIRED_VARS GLM_INCLUDE_DIR) + +mark_as_advanced(GLM_INCLUDE_DIR) From a7ed30184cbf67efbb928fc82923b99d15887045 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 7 Sep 2020 00:35:02 +0200 Subject: [PATCH 2/2] increase versiont 4.3.1 (API related) --- visualization.waveform/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/visualization.waveform/addon.xml.in b/visualization.waveform/addon.xml.in index db5f941..c494f34 100644 --- a/visualization.waveform/addon.xml.in +++ b/visualization.waveform/addon.xml.in @@ -1,7 +1,7 @@  @ADDON_DEPENDS@