From 924c77fe8e4f11005db455f624c6f14781840a11 Mon Sep 17 00:00:00 2001
From: Vincent Tavernier <vincent.tavernier@inria.fr>
Date: Mon, 23 Oct 2017 14:56:28 +0200
Subject: [PATCH] Fix cmakelists include order
---
CMakeLists.txt | 4 ++--
debian/changelog | 6 ++++++
debian/control | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ea8321..c7bc6d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,12 +66,12 @@ generate_export_header(shadertoy
# Include directories
target_include_directories(shadertoy PRIVATE
+ ${shadertoy_INCLUDE_DIRS}
${Boost_INCLUDE_DIR}
${OPENGL_INCLUDE_DIRS}
${oglplus_INCLUDE_DIRS}
${SOIL_INCLUDE_DIRS}
- ${JPEG_INCLUDE_DIRS}
- ${shadertoy_INCLUDE_DIRS})
+ ${JPEG_INCLUDE_DIRS})
# Link dependencies
target_link_libraries(shadertoy
diff --git a/debian/changelog b/debian/changelog
index 0bb3b6c..d29bae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libshadertoy (0.0.10) unstable; urgency=medium
+
+ * Fix CMakeLists.txt include order
+
+ -- Vincent Tavernier <vincent.tavernier@inria.fr> Fri, 23 Oct 2017 15:00:00 +0200
+
libshadertoy (0.0.9) unstable; urgency=medium
* Various bug fixes
diff --git a/debian/control b/debian/control
index 7552a8d..2604676 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Git: https://gitlab.inria.fr/vtaverni/libshadertoy.git
Vcs-Browser: https://gitlab.inria.fr/vtaverni/libshadertoy/tree/master
Package: libshadertoy-dev
-Version: 0.0.9
+Version: 0.0.10
Section: libdevel
Architecture: all
Depends: libshadertoy0 (= ${binary:Version}), ${misc:Depends},
@@ -21,7 +21,7 @@ Description: Development files for libshadertoy
Development headers and documentation for libshadertoy
Package: libshadertoy0
-Version: 0.0.9
+Version: 0.0.10
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Library for rendering ShaderToy programs using OpenGL
--
GitLab