Commit e7ab6d04 authored by Julien Wintz's avatar Julien Wintz
Browse files

Updated build system to better handle exported target. Let distributed...

Updated build system to better handle exported target. Let distributed communicator inherit from QObject instead of dtkCoreObject.
parent 88a1259b
......@@ -3,17 +3,15 @@
## Author: Julien Wintz
## Created: Mon Feb 4 10:29:13 2013 (+0100)
## Version:
## Last-Updated: Fri Mar 22 09:37:49 2013 (+0100)
## Last-Updated: Sun Mar 24 17:07:35 2013 (+0100)
## By: Julien Wintz
## Update #: 29
## Update #: 45
######################################################################
##
### Change Log:
##
######################################################################
set(DTK_TARGETS)
add_subdirectory(dtk)
add_subdirectory(dtkLog)
add_subdirectory(dtkTest)
......@@ -23,4 +21,12 @@ if(Qt53D_FOUND)
add_subdirectory(dtk3D)
endif(Qt53D_FOUND)
export(TARGETS ${DTK_TARGETS} FILE "${CMAKE_BINARY_DIR}/dtkDepends.cmake") # dtkLog dtkCore dtkDistributed
set(DTK_TARGETS)
set(DTK_TARGETS ${DTK_TARGETS} dtkLog)
set(DTK_TARGETS ${DTK_TARGETS} dtkCore)
set(DTK_TARGETS ${DTK_TARGETS} dtkDistributed)
if(Qt53D_FOUND)
set(DTK_TARGETS ${DTK_TARGETS} dtk3D)
endif(Qt53D_FOUND)
export(TARGETS ${DTK_TARGETS} FILE "${CMAKE_BINARY_DIR}/dtkDepends.cmake")
......@@ -3,9 +3,9 @@
## Author: Julien Wintz
## Created: Fri Feb 8 16:49:52 2013 (+0100)
## Version:
## Last-Updated: Fri Mar 22 09:40:00 2013 (+0100)
## Last-Updated: Sun Mar 24 16:58:43 2013 (+0100)
## By: Julien Wintz
## Update #: 31
## Update #: 34
######################################################################
##
### Change Log:
......@@ -67,9 +67,3 @@ install(TARGETS ${PROJECT_NAME}
DESTINATION lib
COMPONENT core
EXPORT dtkDepends)
## ###################################################################
## Target export
## ###################################################################
list(APPEND DTK_TARGETS ${PROJECT_NAME})
......@@ -71,9 +71,3 @@ install(TARGETS ${PROJECT_NAME}
DESTINATION lib
COMPONENT distributed
EXPORT dtkDepends)
## ###################################################################
## Target export
## ###################################################################
list(APPEND DTK_TARGETS ${PROJECT_NAME})
......@@ -37,7 +37,7 @@ public:
// dtkDistributedCommunicator
// /////////////////////////////////////////////////////////////////
dtkDistributedCommunicator::dtkDistributedCommunicator(void) : dtkCoreObject(), d(new dtkDistributedCommunicatorPrivate)
dtkDistributedCommunicator::dtkDistributedCommunicator(void) : QObject(), d(new dtkDistributedCommunicatorPrivate)
{
d->id = 0;
d->initialized = false;
......
......@@ -21,7 +21,7 @@ class dtkDistributedWork;
class dtkDistributedWorker;
class dtkDistributedCommunicatorPrivate;
class dtkDistributedCommunicator : public dtkCoreObject
class dtkDistributedCommunicator : public QObject
{
Q_OBJECT
......
......@@ -3,9 +3,9 @@
## Author: Julien Wintz
## Created: Mon Feb 11 19:23:24 2013 (+0100)
## Version:
## Last-Updated: Fri Mar 22 09:39:53 2013 (+0100)
## Last-Updated: Sun Mar 24 17:03:46 2013 (+0100)
## By: Julien Wintz
## Update #: 24
## Update #: 31
######################################################################
##
### Change Log:
......@@ -56,9 +56,3 @@ install(TARGETS ${PROJECT_NAME}
DESTINATION lib
COMPONENT log
EXPORT dtkDepends)
## ###################################################################
## Target export
## ###################################################################
list(APPEND DTK_TARGETS ${PROJECT_NAME})
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