Skip to content

Commit cdb62ab

Browse files
darbyjohnstondarbyjohnston
authored
Update feather-tk version (#57)
* Update feather-tk version Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Add system info Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Update feather-tk version Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> --------- Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com>
1 parent 1aab607 commit cdb62ab

File tree

112 files changed

+332
-334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+332
-334
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ find_package(OpenColorIO)
6868
find_package(OpenImageIO)
6969
find_package(OpenFX)
7070
find_package(OpenTimelineIO)
71-
find_package(feather-tk)
71+
find_package(ftk)
7272

7373
include_directories(lib)
7474
include_directories(tests)

‎bin/toucan-filmstrip/App.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <toucanRender/Util.h>
77

8-
#include <feather-tk/core/Time.h>
8+
#include <ftk/Core/Time.h>
99

1010
#include <OpenImageIO/imagebufalgo.h>
1111

‎bin/toucan-filmstrip/App.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <toucanRender/ImageGraph.h>
88
#include <toucanRender/TimelineWrapper.h>
99

10-
#include <feather-tk/core/IApp.h>
11-
#include <feather-tk/core/CmdLine.h>
10+
#include <ftk/Core/IApp.h>
11+
#include <ftk/Core/CmdLine.h>
1212

1313
#include <OpenImageIO/imagebuf.h>
1414

‎bin/toucan-filmstrip/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "App.h"
55

6-
#include <feather-tk/core/Context.h>
6+
#include <ftk/Core/Context.h>
77

88
#include <iostream>
99

‎bin/toucan-render/App.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <toucanRender/Read.h>
88
#include <toucanRender/Util.h>
99

10-
#include <feather-tk/core/Time.h>
10+
#include <ftk/Core/Time.h>
1111

1212
#include <OpenImageIO/imagebufalgo.h>
1313

‎bin/toucan-render/App.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <toucanRender/ImageGraph.h>
88
#include <toucanRender/TimelineWrapper.h>
99

10-
#include <feather-tk/core/CmdLine.h>
11-
#include <feather-tk/core/IApp.h>
10+
#include <ftk/Core/CmdLine.h>
11+
#include <ftk/Core/IApp.h>
1212

1313
#include <OpenImageIO/imagebuf.h>
1414

‎bin/toucan-render/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "App.h"
55

6-
#include <feather-tk/core/Context.h>
6+
#include <ftk/Core/Context.h>
77

88
#include <iostream>
99

‎bin/toucan-view/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "toucanView/App.h"
55

6-
#include <feather-tk/core/Context.h>
6+
#include <ftk/Core/Context.h>
77

88
#include <iostream>
99

cmake/SuperBuild/Buildfeather-tk.cmake renamed to cmake/SuperBuild/Buildftk.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include(ExternalProject)
22

3-
set(ftk_GIT_REPOSITORY "https://github.com/darbyjohnston/feather-tk.git")
4-
set(ftk_GIT_TAG "038196681ad5825c431f7da22ff4d873c82b3acd")
3+
set(ftk_GIT_REPOSITORY "https://github.com/grizzlypeak3d/feather-tk.git")
4+
set(ftk_GIT_TAG "2de0861f19326dab562b189e2988a49304475dc3")
55

66
set(ftk_DEPS ZLIB nlohmann_json PNG Freetype lunasvg)
77

‎cmake/SuperBuild/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set(toucan_OpenColorIO ON CACHE BOOL "Build OpenColorIO")
2525
set(toucan_OpenImageIO ON CACHE BOOL "Build OpenImageIO")
2626
set(toucan_OpenTimelineIO ON CACHE BOOL "Build OpenTimelineIO")
2727
set(toucan_OpenFX ON CACHE BOOL "Build OpenFX")
28-
set(toucan_feather-tk ON CACHE BOOL "Build feather-tk")
28+
set(toucan_ftk ON CACHE BOOL "Build feather-tk")
2929

3030
list(PREPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
3131

@@ -119,6 +119,6 @@ endif()
119119
if(toucan_OpenFX)
120120
include(BuildOpenFX)
121121
endif()
122-
if(toucan_feather-tk)
123-
include(Buildfeather-tk)
122+
if(toucan_ftk)
123+
include(Buildftk)
124124
endif()

0 commit comments

Comments
 (0)