Commit efee77cf authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

fix cmake for dtkWrap when dtk is used as a submodule

parent 23b4b3bd
# ChangeLog
## version 1.4.1 - 2018-03-09
- fix cmake for dtkWrap when dtk is used as a submodule
## version 1.4.0 - 2018-03-08
- major update to python wrapping: enhance swig (now we can implement pure python plugins) + add sip wrapping for dtkWidgets. update to dtk_wrap macro API
- no longer use find_packages for Qt in dtkConfig
......
......@@ -24,7 +24,7 @@ project(dtk)
set(dtk_VERSION_MAJOR 1)
set(dtk_VERSION_MINOR 4)
set(dtk_VERSION_PATCH 0)
set(dtk_VERSION_PATCH 1)
set(dtk_VERSION
${dtk_VERSION_MAJOR}.${dtk_VERSION_MINOR}.${dtk_VERSION_PATCH})
......@@ -185,7 +185,7 @@ find_package(Qt5 REQUIRED COMPONENTS
##
## ###################################################################
include(${CMAKE_SOURCE_DIR}/cmake/dtkWrap.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/dtkWrap.cmake)
## ###################################################################
## Doc setup
......
......@@ -28,7 +28,7 @@ int main(int argc, char **argv)
dtkDistributedGuiApplication *application = dtkDistributedGuiApplication::create(argc, argv);
application->setApplicationName("dtkComposerEvaluator");
application->setApplicationVersion("1.4.0");
application->setApplicationVersion("1.4.1");
application->setOrganizationName("inria");
application->setOrganizationDomain("fr");
bool no_gui = application->noGui();
......
......@@ -23,7 +23,7 @@ int main(int argc, char **argv)
{
dtkCoreApplication *application = dtkCoreApplication::create(argc, argv);
application->setApplicationName("dtkDistributedServer");
application->setApplicationVersion("1.4.0");
application->setApplicationVersion("1.4.1");
application->setOrganizationName("inria");
application->setOrganizationDomain("fr");
......
......@@ -61,7 +61,7 @@ int main(int argc, char **argv)
{
dtkDistributedGuiApplication *app = dtkDistributedGuiApplication::create(argc, argv);
app->setApplicationName("dtkDistributedSlave");
app->setApplicationVersion("1.4.0");
app->setApplicationVersion("1.4.1");
app->setOrganizationName("inria");
QCommandLineParser *parser = app->parser();
......
......@@ -35,7 +35,7 @@ set(dtk_INCLUDE_DIRS
"@CMAKE_CURRENT_BINARY_DIR@")
include("@CMAKE_BINARY_DIR@/dtkDepends.cmake")
include("@CMAKE_SOURCE_DIR@/cmake/dtkWrap.cmake")
include("@CMAKE_CURRENT_SOURCE_DIR@/cmake/dtkWrap.cmake")
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} "@CMAKE_SOURCE_DIR@/cmake/")
......@@ -46,7 +46,7 @@ set(dtk_MODULE_PATH "@CMAKE_BINARY_DIR@")
set(dtk_INSTALL_DOCS "@dtk_INSTALL_DOCS@")
set(dtk_CONFIG_DOCS "@dtk_CONFIG_DOCS@")
set(dtk_WRAP_PREFIX "@CMAKE_SOURCE_DIR@/wrp")
set(dtk_WRAP_PREFIX "@CMAKE_CURRENT_SOURCE_DIR@/wrp")
## ###################################################################
## Options
......
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