Skip to content

Commit da3d49d

Browse files
authored
Merge pull request #103 from boris-fx/feature/ocio
OpenColorIO Properties
2 parents 3d10f39 + 52a0ac5 commit da3d49d

File tree

13 files changed

+3706
-5
lines changed

13 files changed

+3706
-5
lines changed

.dir-locals.el

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
;;; Directory Local Variables -*- no-byte-compile: t -*-
2+
;;; For more information see (info "(emacs) Directory Variables")
3+
4+
;; for C and C++, we use 2 space offset, no tabs
5+
((prog-mode . ((c-basic-offset . 2)
6+
(indent-tabs-mode . nil)))

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ else()
1111
LANGUAGES CXX) # no CUDA
1212
endif()
1313
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
14-
set(CMAKE_CXX_STANDARD 14)
14+
set(CMAKE_CXX_STANDARD 17)
1515
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1616
set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
17+
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1718
add_definitions(-D_HAS_AUTO_PTR_ETC)
1819
if(APPLE)
1920
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
@@ -62,6 +63,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_BINARY_DIR})
6263
# Conan packages
6364
find_package(EXPAT)
6465
find_package(opengl_system REQUIRED)
66+
find_package(cimg REQUIRED)
67+
find_package(spdlog REQUIRED)
6568

6669
# Macros
6770
include(OpenFX)

Examples/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ set(OFX_SUPPORT_HEADER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Support/include")
33
set(PLUGINS
44
Basic
55
ChoiceParams
6+
ColourSpace
67
Custom
78
DepthConverter
89
Invert
@@ -27,3 +28,5 @@ endforeach()
2728

2829
target_link_libraries(example-OpenGL PRIVATE opengl::opengl)
2930
target_link_libraries(example-Custom PRIVATE opengl::opengl)
31+
target_link_libraries(example-ColourSpace PRIVATE cimg::cimg)
32+
target_link_libraries(example-ColourSpace PRIVATE spdlog::spdlog_header_only)

Examples/ColourSpace/Info.plist

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>English</string>
7+
<key>CFBundleExecutable</key>
8+
<string>colourspace.ofx</string>
9+
<key>CFBundleInfoDictionaryVersion</key>
10+
<string>6.0</string>
11+
<key>CFBundlePackageType</key>
12+
<string>BNDL</string>
13+
<key>CFBundleSignature</key>
14+
<string>????</string>
15+
<key>CFBundleVersion</key>
16+
<string>0.0.1d1</string>
17+
<key>CSResourcesFileMapped</key>
18+
<true/>
19+
</dict>
20+
</plist>

0 commit comments

Comments
 (0)