Skip to content

Commit 2137421

Browse files
author
Raphael Dumusc
committed
Merge pull request #13 from tribal-tec/master
Update Release 0.3.1 (generated files only)
2 parents 4cdedc9 + bdf464e commit 2137421

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

CMake/FindPackages.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ find_package(PkgConfig)
66

77
set(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
88
if(PKG_CONFIG_EXECUTABLE)
9-
find_package(Lunchbox 1.9)
9+
find_package(Lunchbox 1.10)
1010
if((NOT Lunchbox_FOUND) AND (NOT LUNCHBOX_FOUND))
11-
pkg_check_modules(Lunchbox Lunchbox>=1.9)
11+
pkg_check_modules(Lunchbox Lunchbox>=1.10)
1212
endif()
1313
if((NOT Lunchbox_FOUND) AND (NOT LUNCHBOX_FOUND))
1414
message(FATAL_ERROR "Could not find Lunchbox")
1515
endif()
1616
else()
17-
find_package(Lunchbox 1.9 REQUIRED)
17+
find_package(Lunchbox 1.10 REQUIRED)
1818
endif()
1919

2020
if(PKG_CONFIG_EXECUTABLE)

CMake/FindRequired.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# generated by Buildyard, do not edit. Sets FOUND_REQUIRED if all required
33
# dependencies are found. Used by Buildyard.cmake
44
set(FIND_REQUIRED_FAILED)
5-
find_package(Lunchbox 1.9 QUIET)
5+
find_package(Lunchbox 1.10 QUIET)
66
if(NOT Lunchbox_FOUND AND NOT LUNCHBOX_FOUND)
77
set(FIND_REQUIRED_FAILED "${FIND_REQUIRED_FAILED} Lunchbox")
88
endif()

CMake/GLStats.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11

22

3-
43
set(GLSTATS_PACKAGE_VERSION 0.3)
54
set(GLSTATS_REPO_URL https://github.com/Eyescale/GLStats.git)
65
set(GLSTATS_REPO_TAG master)
76
set(GLSTATS_DEPENDS REQUIRED Lunchbox OpenGL)
87
set(GLSTATS_DEB_DEPENDS libx11-dev libgl1-mesa-dev)
98
set(GLSTATS_FORCE_BUILD ${CI_BUILD})
109

11-
if(CI_BUILD_COMMIT)
12-
set(GLSTATS_REPO_TAG ${CI_BUILD_COMMIT})
13-
else()
14-
set(GLSTATS_REPO_TAG master)
15-
endif()
16-
set(GLSTATS_FORCE_BUILD ON)
17-
set(GLSTATS_SOURCE ${CMAKE_SOURCE_DIR})
1810
if(CI_BUILD_COMMIT)
1911
set(GLSTATS_REPO_TAG ${CI_BUILD_COMMIT})
2012
else()

CMake/depends.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
config.eyescale https://github.com/Eyescale/config.git master
1+
config.eyescale https://github.com/Eyescale/config.git master

0 commit comments

Comments
 (0)