Merge branch 'develop' into fix_formatTools

Author: cchampet

CMakeLists.txt

@@ -23,9 +23,6 @@ endif()
 # Diplay commands being ran by CMake
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
-# Create an alias for all OFX plugins.
-add_custom_target(ofxplugins)
-
 # Include subdirs
 set(SEQUENCEPARSER_PYTHON_VERSION ${TUTTLE_PYTHON_VERSION})
 add_subdirectory(libraries/sequenceParser)

INSTALL.md

@@ -20,6 +20,20 @@ make
 make install
 ```
 
+Custom Makefile target:
+* ofxplugins: build all the OpenFX plugins.
+* ofxio: build readers and writers plugins.
+* ofxdisplay: build plugins to view images as a color cube, an histogram, or in a simple GL view port.
+* ofxgenerator: build plugins to generate basic inputs (checkerboard, bars, wheel...), images based on procedural geometry, or burn text on images.
+* ofxchannel: build plugins to process operations on channels of images.
+* ofxcolor: build plugins to process mathematics operations on color of images.
+* ofxfilter: build filter plugins.
+* ofxgeometry: build plugins to process mathematics operations on geometry of images.
+* ofxmath: build plugins to process mathematics operations on images.
+* ofxtime: build plugins to shift time.
+* ofxtransition: build plugins to process transitions.
+* ofxanalysis: build plugins to analyse (luminosity, channel values, Kurtosis, Skewness...) and compare images (psnr...).
+* ofxdebug: build plugins to display information about the host and all OpenFX plugins available.
 
 ## Additionnal dependencies for sam
 

cmake/TuttleMacros.cmake

@@ -53,6 +53,9 @@ endfunction(tuttle_install_shared_libs)
 
 
 # Use this function to create a new plugin target
+# Each new plugin is added to 2 Makefile custom targets:
+#   * 'ofxplugins'
+#   * 'ofx<plugin_parent_dir>'
 # The first argument is the plugin name
 # the second argument is a list of files to compile
 function(tuttle_ofx_plugin_target PLUGIN_NAME)
@@ -111,20 +114,34 @@ function(tuttle_ofx_plugin_target PLUGIN_NAME)
         # Plugin target is a shared library
         add_library(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES})
 
+        # Get plugin parent directory
+        get_filename_component(PLUGIN_PARENT_ABSOLUTE_PATH ${CMAKE_CURRENT_SOURCE_DIR} PATH)
+        get_filename_component(PLUGIN_PARENT_DIR ${PLUGIN_PARENT_ABSOLUTE_PATH} NAME)
+        set(PLUGIN_CUSTOM_TARGET "ofx${PLUGIN_PARENT_DIR}")
+        set(PLUGIN_COMMON_TARGET "ofxplugins")
+
+        # Create custom target if it does not exist
+        if(NOT TARGET ${PLUGIN_COMMON_TARGET})
+            add_custom_target(${PLUGIN_COMMON_TARGET})
+        endif()
+        if(NOT TARGET ${PLUGIN_CUSTOM_TARGET})
+            add_custom_target(${PLUGIN_CUSTOM_TARGET})
+        endif()
+
+        # Add this new plugin to custom Makefile targets
+        add_dependencies(${PLUGIN_COMMON_TARGET} ${PLUGIN_NAME})
+        add_dependencies(${PLUGIN_CUSTOM_TARGET} ${PLUGIN_NAME})
+
         # Static link with a common plugin library
-        set(IS_IOPLUGIN ${ARGV2}) 
-        if(IS_IOPLUGIN)
+        if(${PLUGIN_PARENT_DIR} STREQUAL "io")
             target_link_libraries(${PLUGIN_NAME} tuttleIOPluginLib)
-        else(IS_IOPLUGIN)
+        else()
             target_link_libraries(${PLUGIN_NAME} tuttlePluginLib)
-        endif(IS_IOPLUGIN)
+        endif()
 
         set_target_properties(${PLUGIN_NAME} PROPERTIES SUFFIX "${_plugin_version_suffix}.ofx")
         set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "")
 
-        # Add this new plugin to the global alias ofxplugins
-        add_dependencies(ofxplugins ${PLUGIN_NAME})
-
         # FIXME: why tuttlePluginLib depends on OpenGL ? is it necessary ?
         if(APPLE)
             find_package(OpenGL)

plugins/image/io/AudioVideo/CMakeLists.txt

@@ -2,7 +2,7 @@
 include(TuttleMacros)
 
 # Create target AudioVideo
-tuttle_ofx_plugin_target(AudioVideo "" TRUE)
+tuttle_ofx_plugin_target(AudioVideo)
 
 # Find ffmpeg libraries which are dependencies of avTranscoder
 find_package(FFmpeg COMPONENTS avformat avcodec avutil swscale swresample)

plugins/image/io/AudioVideo/avTranscoder

@@ -1,5 +1,5 @@
 #define OFXPLUGIN_VERSION_MAJOR 4
-#define OFXPLUGIN_VERSION_MINOR 7
+#define OFXPLUGIN_VERSION_MINOR 8
 
 #include <tuttle/plugin/Plugin.hpp>
 #include "reader/AVReaderPluginFactory.hpp"

plugins/image/io/AudioVideo/src/mainEntry.cpp

@@ -1,7 +1,7 @@
 # Macros used to create an openfx plugin with tuttle
 include(TuttleMacros)
 
-tuttle_ofx_plugin_target(Dpx "" True)
+tuttle_ofx_plugin_target(Dpx)
 
 # Add include of dpx-google-code only to DPX plugin
 target_include_directories(Dpx PUBLIC "src/dpx-google-code")

plugins/image/io/Dpx/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Macros used to create an openfx plugin with tuttle
 include(TuttleMacros)
 
-tuttle_ofx_plugin_target(Exr "" TRUE)
+tuttle_ofx_plugin_target(Exr)
 
 # Add external libraries
 set(Exr_LIBRARIES OpenEXR IlmBase sequenceParser)

plugins/image/io/Exr/CMakeLists.txt

@@ -270,7 +270,10 @@ bool EXRReaderPlugin::getRegionOfDefinition(const OFX::RegionOfDefinitionArgumen
 {
     const std::string filepath(getAbsoluteFilenameAt(args.time));
     if(!bfs::exists(filepath))
-        return false;
+    {
+        BOOST_THROW_EXCEPTION(exception::FileInSequenceNotExist() << exception::user("EXR: Unable to open file")
+                                                                  << exception::filename(filepath));
+    }
 
     try
     {

plugins/image/io/Exr/src/reader/EXRReaderPlugin.cpp

@@ -2,7 +2,7 @@
 # Macros used to create an openfx plugin with tuttle
 include(TuttleMacros)
 
-tuttle_ofx_plugin_target(ImageMagick "" TRUE)
+tuttle_ofx_plugin_target(ImageMagick)
 
 # Add external libraries with specific components
 tuttle_ofx_plugin_add_library(ImageMagick ImageMagick COMPONENTS MagickCore)