Commit cc1a1e9e authored by Meriadeg Perrinel's avatar Meriadeg Perrinel
Browse files

merging

parent f2d51c62
......@@ -22,15 +22,9 @@ cmake_minimum_required(VERSION 2.8.6)
project(dtk)
set(${PROJECT_NAME}_VERSION_MAJOR 0 CACHE STRING "dtk major version number.")
<<<<<<< HEAD
set(${PROJECT_NAME}_VERSION_MINOR 0 CACHE STRING "dtk minor version number.")
set(${PROJECT_NAME}_VERSION_BUILD 9 CACHE STRING "dtk build version number.")
=======
set(${PROJECT_NAME}_VERSION_MINOR 6 CACHE STRING "dtk minor version number.")
set(${PROJECT_NAME}_VERSION_BUILD 0 CACHE STRING "dtk build version number.")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
set(${PROJECT_NAME}_VERSION
"${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_BUILD}")
......
......@@ -321,13 +321,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
......@@ -281,15 +281,9 @@ void dtkComposerNodeNumberOperatorUnarySqrt::run(void)
case QVariant::Int:
case QVariant::UInt:
case QVariant::LongLong:
<<<<<<< HEAD
// case QVariant::ULongLong:
// d->emitter->setData(sqrtl(qVariantValue<qlonglong>(d->receiver->data())));
// break;
=======
case QVariant::ULongLong:
d->emitter.setData(sqrt(qVariantValue<qlonglong>(d->receiver.data())));
break;
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
case QVariant::Double:
d->emitter.setData(sqrt(qVariantValue<double>(d->receiver.data())));
break;
......
......@@ -206,12 +206,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Handling of generated script modules
......
......@@ -30,7 +30,6 @@
dtkPlugin::dtkPlugin(QObject *parent) : dtkAbstractObject(*new dtkPluginPrivate(this), parent)
{
<<<<<<< HEAD
public:
dtkAbstractViewFactory *viewSingletonFactory;
dtkAbstractDataFactory *dataSingletonFactory;
......@@ -41,21 +40,16 @@ public:
// /////////////////////////////////////////////////////////////////
// dtkPlugin
// /////////////////////////////////////////////////////////////////
=======
}
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
dtkPlugin::dtkPlugin(const dtkPlugin& other) : dtkAbstractObject(*new dtkPluginPrivate(*other.d_func()), other)
{
<<<<<<< HEAD
DTK_UNUSED(parent);
d->viewSingletonFactory = dtkAbstractViewFactory::instance();
d->dataSingletonFactory = dtkAbstractDataFactory::instance();
d->processSingletonFactory = dtkAbstractProcessFactory::instance();
=======
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
}
dtkPlugin::~dtkPlugin(void)
......
......@@ -17,15 +17,13 @@
*
*/
<<<<<<< HEAD
#include "dtkAbstractData.h"
#include "dtkAbstractDataFactory.h"
#include "dtkAbstractProcessFactory.h"
#include "dtkAbstractViewFactory.h"
#include "dtkPluginManager.h"
=======
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
#include "dtkPlugin.h"
#include "dtkPluginManager.h"
......
......@@ -86,13 +86,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
......@@ -220,13 +220,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
......@@ -178,13 +178,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
......@@ -80,13 +80,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
......@@ -93,13 +93,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
......@@ -89,13 +89,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
......@@ -107,13 +107,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
......@@ -166,7 +166,7 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
## #################################################################
## Handling of generated script modules
## #################################################################
......@@ -184,11 +184,7 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
set(${PROJECT_NAME}_MODULES ${CMAKE_BINARY_DIR}/modules/vr.py)
endif(DTK_BUILD_WRAPPERS AND SWIG_FOUND AND PYTHONLIBS_FOUND)
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
......
......@@ -86,13 +86,6 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
<<<<<<< HEAD
=======
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
>>>>>>> cdf41cfcdde4be758fe34ac384f60a3eea379c85
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
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