diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ea832167a5b9ec3e31c09bbbb952bdb92cb05c7..c7bc6d98ff13a1be8c9cb50e3ed1db3df8adc281 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 0bb3b6c072e75ccaf3446442f6e19e67f19a4f96..d29bae0c1291e403ba90164d5c13bcffd5fbe202 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 7552a8d2574b29450b31bc3a9ec15b7d89a8c4b1..260467619fb6358148b2c5afc1dfc1e5ce0bc34e 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