From 38bcf08d7ff68dd1bfc744c02a8cd5f284235ce1 Mon Sep 17 00:00:00 2001 From: Keisuke OGAKI Date: Fri, 1 Apr 2016 00:25:27 +0900 Subject: [PATCH] c++14 is not required follow newer version of utility --- CMakeLists.txt | 4 ++-- opentoonz_plugin_utility | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7d4572..3dab443 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if(WIN32) endif(WIN32) if(APPLE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=libc++") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++") set(PLUGIN_UTILITY_LIB "${CMAKE_CURRENT_SOURCE_DIR}/opentoonz_plugin_utility/lib/${CMAKE_CFG_INTDIR}/libopentoonz_plugin_utility.a") endif(APPLE) @@ -27,7 +27,7 @@ find_package(OpenCV REQUIRED) set(LIBS ${OpenCV_LIBS} ${PLUGIN_UTILITY_LIB}) include_directories(opentoonz_plugin_utility/include - opentoonz_plugin_utility/opentoonz_plugin_headers + opentoonz_plugin_utility/plugin_sdk/core "${OpenCV_INCLUDE_DIRS}") link_directories("${OpenCV_LIBS}") diff --git a/opentoonz_plugin_utility b/opentoonz_plugin_utility index b627ffe..30100d7 160000 --- a/opentoonz_plugin_utility +++ b/opentoonz_plugin_utility @@ -1 +1 @@ -Subproject commit b627ffea081de27cffa9eebde4f9618ee6ffbbfe +Subproject commit 30100d72e0548abe9a13d5a0bd4a03ac67c120c3