Merge pull request #121 from phunkyfish/update-glm

Update GLM to 1.0.1

Author: garbear

CMakeLists.txt

@@ -4,6 +4,7 @@ project(visualization.projectm)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 
 find_package(Kodi REQUIRED)
+find_package(glm REQUIRED)
 find_package(ProjectM REQUIRED)
 
 if(NOT WIN32 AND (APP_RENDER_SYSTEM STREQUAL "gl" OR NOT APP_RENDER_SYSTEM))

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)

depends/common/glm/flags.txt

@@ -1 +1 @@
--DGLM_TEST_ENABLE_CXX_11=1 -DGLM_TEST_ENABLE=0 -DGLM_TEST_ENABLE_SIMD_SSE2=0 -DCMAKE_INSTALL_LIBDIR=lib
+-DGLM_TEST_ENABLE:BOOL=OFF

depends/common/glm/glm.sha256

@@ -1 +1 @@
-785211e3e5757f64bc20eff1c5dd89cfc35fc8aea8e06b4b189e4f3ea4865861
+9f3174561fd26904b23f0db5e560971cbf9b3cbda0b280f04d5c379d03bf234c

depends/common/glm/glm.txt

@@ -1 +1 @@
-glm https://github.com/g-truc/glm/releases/download/0.9.9.5/glm-0.9.9.5.7z
+glm https://github.com/g-truc/glm/archive/1.0.1.tar.gz

visualization.projectm/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="visualization.projectm"
-  version="22.0.0"
+  version="22.0.1"
   name="projectM"
   provider-name="Team Kodi">
   <requires>@ADDON_DEPENDS@</requires>