Skip to content

Commit bda8529

Browse files
authored
Merge pull request #19 from AlwinEsch/Leia-change
[Leia] fix standalone build with newer glm versions (>= 0.9.9.6)
2 parents 337a5e9 + 9f3ba85 commit bda8529

File tree

3 files changed

+35
-1
lines changed

3 files changed

+35
-1
lines changed

Findglm.cmake

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#.rst:
2+
# Findglm
3+
# ------------
4+
# Finds the OpenGL Mathematics (GLM) as a header only C++ mathematics library.
5+
#
6+
# This will define the following variables:
7+
#
8+
# GLM_FOUND - system has OpenGLES
9+
# GLM_INCLUDE_DIR - the OpenGLES include directory
10+
#
11+
# Note: Install was removed from GLM on version 0.9.9.6.
12+
13+
find_package(PkgConfig)
14+
if(PKG_CONFIG_FOUND)
15+
pkg_check_modules(PC_GLM glm QUIET)
16+
endif()
17+
18+
find_path(GLM_INCLUDE_DIR glm.hpp
19+
PATHS ${PC_GLM_INCLUDEDIR}
20+
PATH_SUFFIXES glm)
21+
22+
include(FindPackageHandleStandardArgs)
23+
find_package_handle_standard_args(glm REQUIRED_VARS GLM_INCLUDE_DIR)
24+
25+
mark_as_advanced(GLM_INCLUDE_DIR)

visualization.fishbmc/addon.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<addon
33
id="visualization.fishbmc"
4-
version="5.1.2"
4+
version="5.1.3"
55
name="FishBMC"
66
provider-name="26elf">
77
<requires>@ADDON_DEPENDS@</requires>

visualization.fishbmc/changelog.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
5.1.3 (2020-09-06)
2+
- Fix standalone build with newer glm versions (>= 0.9.9.6)
3+
4+
5.1.2 (2019-10-09)
5+
- Remove not needed virtual from class
6+
- Cleanup debian package code
7+
- Add license name and source URL to addon.xml
8+
- Clean FindOpenGLES.cmake description
9+
110
5.1.1 (2019-08-23)
211
- Update .travis.yml to Leia
312
- Add Jenkinsfile for test and binary repo upload

0 commit comments

Comments
 (0)