Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dtk
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
dtk
dtk
Commits
efee77cf
Commit
efee77cf
authored
Mar 09, 2018
by
NICLAUSSE Nicolas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix cmake for dtkWrap when dtk is used as a submodule
parent
23b4b3bd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
7 deletions
+9
-7
CHANGES.md
CHANGES.md
+2
-0
CMakeLists.txt
CMakeLists.txt
+2
-2
app/dtkComposerEvaluator/main.cpp
app/dtkComposerEvaluator/main.cpp
+1
-1
app/dtkDistributedServer/main.cpp
app/dtkDistributedServer/main.cpp
+1
-1
app/dtkDistributedSlave/main.cpp
app/dtkDistributedSlave/main.cpp
+1
-1
cmake/dtkConfig.cmake.in
cmake/dtkConfig.cmake.in
+2
-2
No files found.
CHANGES.md
View file @
efee77cf
# 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
...
...
CMakeLists.txt
View file @
efee77cf
...
...
@@ -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
...
...
app/dtkComposerEvaluator/main.cpp
View file @
efee77cf
...
...
@@ -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
();
...
...
app/dtkDistributedServer/main.cpp
View file @
efee77cf
...
...
@@ -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"
);
...
...
app/dtkDistributedSlave/main.cpp
View file @
efee77cf
...
...
@@ -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
();
...
...
cmake/dtkConfig.cmake.in
View file @
efee77cf
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment