Skip to content

Commit

Permalink
Merge pull request #35 from AlwinEsch/Matrix-change
Browse files Browse the repository at this point in the history
[Matrix] fix standalone build with newer glm versions (>= 0.9.9.6)
  • Loading branch information
AlwinEsch authored Sep 6, 2020
2 parents 300a994 + a7ed301 commit a59a721
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
25 changes: 25 additions & 0 deletions Findglm.cmake
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion visualization.waveform/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="visualization.waveform"
version="4.3.0"
version="4.3.1"
name="Waveform"
provider-name="MrC">
<requires>@ADDON_DEPENDS@</requires>
Expand Down

0 comments on commit a59a721

Please sign in to comment.