From 879dab9a9eae4e53688002dbdae7d5d66a5ef57f Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Thu, 25 Jan 2018 12:07:34 -0500 Subject: [PATCH] update gpuimage, add example (objective-c++) --- cmake/configs/default.cmake | 2 +- cmake/projects/GPUImage/hunter.cmake | 11 +++++++++++ examples/GPUImage/CMakeLists.txt | 17 +++++++++++++++++ examples/GPUImage/foo.mm | 5 +++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 examples/GPUImage/CMakeLists.txt create mode 100644 examples/GPUImage/foo.mm diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 2a27f840a6..b99a6c719c 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -69,7 +69,7 @@ hunter_config(Expat VERSION 2.1.1) if(MSVC) hunter_config(getopt VERSION 1.0.0-p0) endif() -hunter_config(GPUImage VERSION 0.1.6-p6) +hunter_config(GPUImage VERSION 0.1.6-p7) hunter_config(GSL VERSION 2.1.0-p2) hunter_config(Igloo VERSION 1.1.1-hunter) hunter_config(intsizeof VERSION 2.0.1) diff --git a/cmake/projects/GPUImage/hunter.cmake b/cmake/projects/GPUImage/hunter.cmake index e1a9f4544f..240eb91a3d 100644 --- a/cmake/projects/GPUImage/hunter.cmake +++ b/cmake/projects/GPUImage/hunter.cmake @@ -31,6 +31,17 @@ hunter_add_version( 230f9f9ba0fe1cce96827ea0cfc944b6df05ec34 ) + hunter_add_version( + PACKAGE_NAME + GPUImage + VERSION + "0.1.6-p7" + URL + "https://github.com/hunter-packages/GPUImage/archive/v0.1.6-p7.tar.gz" + SHA1 + 9ca6d9b683d56a78d6c5925e04c0d6952bd2bf3c + ) + hunter_cmake_args( GPUImage CMAKE_ARGS GPUIMAGE_BUILD_EXAMPLES=OFF diff --git a/examples/GPUImage/CMakeLists.txt b/examples/GPUImage/CMakeLists.txt new file mode 100644 index 0000000000..ea7f2089d5 --- /dev/null +++ b/examples/GPUImage/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2018, Ruslan Baratov +# Copyright (c) 2018, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-GPUImage) + +hunter_add_package(GPUImage) +find_package(GPUImage CONFIG REQUIRED) + +add_executable(foo foo.mm) +target_link_libraries(foo GPUImage::gpuimage) diff --git a/examples/GPUImage/foo.mm b/examples/GPUImage/foo.mm new file mode 100644 index 0000000000..7c61c3a92d --- /dev/null +++ b/examples/GPUImage/foo.mm @@ -0,0 +1,5 @@ +#include + +int main() { + auto *filter = [[GPUImageGrayscaleFilter alloc] init]; +}