Commit e4405057 authored by Julien Wintz's avatar Julien Wintz

Merge pull request #25 from papadop/ErrorMessage

Error message during plugin loading should not be masked in non verbose mode
parents 0ddf9398 596b7c46
......@@ -207,17 +207,17 @@ template <typename T> void dtkCorePluginManager<T>::load(const QString& path)
error += path;
error += " - ";
error += loader->errorString();
if(d->verboseLoading) { dtkWarn() << error; }
dtkWarn() << error;
delete loader;
return;
}
T *plugin = qobject_cast<T *>(loader->instance());
if(!plugin) {
if (!plugin) {
QString error = "Unable to retrieve ";
error += path;
if(d->verboseLoading) { dtkWarn() << error; }
dtkWarn() << error;
loader->unload();
delete loader;
......
......@@ -101,15 +101,23 @@ if(DTK_BUILD_WRAPPERS AND SWIG_FOUND)
set(${PROJECT_NAME}_WRAP_DEPENDS ${${PROJECT_NAME}_HEADERS})
if(PYTHONLIBS_FOUND)
dtk_wrap(${PROJECT_NAME} ${PROJECT_NAME}_SOURCES_WRAP dtkcoresupport python ${PROJECT_SOURCE_DIR}/dtkCoreSupport.i ${${PROJECT_NAME}_WRAP_DEPENDS})
option(DTK_WRAPPING_PYTHON "Build python wrapper" OFF)
option(DTK_WRAPPING_TCL "Build TCL wrapper" OFF)
option(DTK_WRAPPING_CSHARP "Build C# wrapper" OFF)
if (DTK_WRAPPING_PYTHON)
if (PYTHONLIBS_FOUND)
dtk_wrap(${PROJECT_NAME} ${PROJECT_NAME}_SOURCES_WRAP dtkcoresupport python ${PROJECT_SOURCE_DIR}/dtkCoreSupport.i ${${PROJECT_NAME}_WRAP_DEPENDS})
endif()
endif()
if(TCL_FOUND)
dtk_wrap(${PROJECT_NAME} ${PROJECT_NAME}_SOURCES_WRAP dtkcoresupport tcl ${PROJECT_SOURCE_DIR}/dtkCoreSupport.i ${${PROJECT_NAME}_WRAP_DEPENDS})
if (DTK_WRAPPING_TCL)
if (TCL_FOUND)
dtk_wrap(${PROJECT_NAME} ${PROJECT_NAME}_SOURCES_WRAP dtkcoresupport tcl ${PROJECT_SOURCE_DIR}/dtkCoreSupport.i ${${PROJECT_NAME}_WRAP_DEPENDS})
endif()
endif()
if(TRUE)
if (DTK_WRAPPING_CSHARP)
dtk_wrap(${PROJECT_NAME} ${PROJECT_NAME}_SOURCES_WRAP dtkcoresupport csharp ${PROJECT_SOURCE_DIR}/dtkCoreSupport.i ${${PROJECT_NAME}_WRAP_DEPENDS})
endif()
endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment