Skip to content

GitLab

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

update build rules towards handling of clean installation.

parent 06ef86e9
Hide whitespace changes
Inline Side-by-side
cmake/dtkBuild.cmake
View file @ d9cc0724
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Fri Apr 2 09:05:55 2010 (+0200)
## Version: $Id$
## Last-Updated: Tue Apr 17 21:55:44 2012 (+0200)
## Last-Updated: Fri Apr 27 20:46:14 2012 (+0200)
## By: Julien Wintz
## Update #: 203
## Update #: 206
######################################################################
##
### Commentary:
......@@ -48,13 +48,8 @@ mark_as_advanced(BUILD_TESTING)
## #################################################################
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
if(WIN32)
string(REPLACE "\\" "/" ProgramFiles "$ENV{ProgramFiles}")
set(CMAKE_INSTALL_PREFIX "${ProgramFiles}/Inria/${PROJECT_NAME}" CACHE PATH "${PROJECT_NAME} install prefix" FORCE)
else()
set(CMAKE_INSTALL_PREFIX "/usr/local/inria/${PROJECT_NAME}" CACHE PATH "${PROJECT_NAME} install prefix" FORCE)
endif()
endif()
set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install" CACHE PATH "${PROJECT_NAME} install prefix" FORCE)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
## #################################################################
## Configure arch
......
include/dtkComposer
View file @ d9cc0724
......@@ -40,6 +40,8 @@
#include "../src/dtkComposer/dtkComposerNodeProcess.h"
#include "../src/dtkComposer/dtkComposerNodeProxy.h"
#include "../src/dtkComposer/dtkComposerNodeQuaternion.h"
#include "../src/dtkComposer/dtkComposerNodeQuaternionOperatorBinary.h"
#include "../src/dtkComposer/dtkComposerNodeQuaternionOperatorUnary.h"
#include "../src/dtkComposer/dtkComposerNodeReal.h"
#include "../src/dtkComposer/dtkComposerNodeRemote.h"
#include "../src/dtkComposer/dtkComposerNodeString.h"
......@@ -48,6 +50,9 @@
#include "../src/dtkComposer/dtkComposerNodeTrackerVrpn.h"
#include "../src/dtkComposer/dtkComposerNodeVector.h"
#include "../src/dtkComposer/dtkComposerNodeVector3D.h"
#include "../src/dtkComposer/dtkComposerNodeVector3DOperatorBinary.h"
#include "../src/dtkComposer/dtkComposerNodeVector3DOperatorTernary.h"
#include "../src/dtkComposer/dtkComposerNodeVector3DOperatorUnary.h"
#include "../src/dtkComposer/dtkComposerNodeVectorOperator.h"
#include "../src/dtkComposer/dtkComposerNodeView.h"
#include "../src/dtkComposer/dtkComposerNodeWorld.h"
......
include/dtkCore
View file @ d9cc0724
#include "../src/dtkCore/dtkAbstractContainer.h"
#include "../src/dtkCore/dtkAbstractData.h"
#include "../src/dtkCore/dtkAbstractDataComposite.h"
#include "../src/dtkCore/dtkAbstractDataConverter.h"
......@@ -15,6 +16,7 @@
#include "../src/dtkCore/dtkAbstractViewFactory.h"
#include "../src/dtkCore/dtkAbstractViewInteractor.h"
#include "../src/dtkCore/dtkAbstractViewNavigator.h"
#include "../src/dtkCore/dtkContainerVector.h"
#include "../src/dtkCore/dtkCpuid.h"
#include "../src/dtkCore/dtkGlobal.h"
#include "../src/dtkCore/dtkPlugin.h"
......
src/dtkComposer/CMakeLists.txt
View file @ d9cc0724
......@@ -3,9 +3,9 @@
## Author: Julien Wintz
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Fri Se
## Last-Updated: Fri Apr 27 14:38:18 2012 (+0200)
## By: tkloczko
## Update #: 529
## Last-Updated: Fri Apr 27 20:55:46 2012 (+0200)
## By: Julien Wintz
## Update #: 530
######################################################################
##
### Commentary:
......@@ -312,13 +312,12 @@ generate_export_header(${PROJECT_NAME}
EXPORT_FILE_NAME "${PROJECT_NAME}Export.h")
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}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h")
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
## #################################################################
## Source file layout in development environments like Visual Studio
......
src/dtkComposer/dtkComposerNodeQuaternionOperatorBinary 0 → 100644
View file @ d9cc0724
#include "dtkComposerNodeQuaternionOperatorBinary.h"
\ No newline at end of file
src/dtkComposer/dtkComposerNodeQuaternionOperatorUnary 0 → 100644
View file @ d9cc0724
#include "dtkComposerNodeQuaternionOperatorUnary.h"
\ No newline at end of file
src/dtkComposer/dtkComposerNodeVector3DOperatorBinary 0 → 100644
View file @ d9cc0724
#include "dtkComposerNodeVector3DOperatorBinary.h"
\ No newline at end of file
src/dtkComposer/dtkComposerNodeVector3DOperatorTernary 0 → 100644
View file @ d9cc0724
#include "dtkComposerNodeVector3DOperatorTernary.h"
\ No newline at end of file
src/dtkComposer/dtkComposerNodeVector3DOperatorUnary 0 → 100644
View file @ d9cc0724
#include "dtkComposerNodeVector3DOperatorUnary.h"
\ No newline at end of file
src/dtkCore/CMakeLists.txt
View file @ d9cc0724
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 18:39:20 2009 (+0200)
## Version: $Id$
## Last-Updated: Fri Apr 27 17:29:33 2012 (+0200)
## By: tkloczko
## Update #: 284
## Last-Updated: Fri Apr 27 21:05:06 2012 (+0200)
## By: Julien Wintz
## Update #: 285
######################################################################
##
### Commentary:
......@@ -201,13 +201,12 @@ generate_export_header(${PROJECT_NAME}
EXPORT_FILE_NAME "${PROJECT_NAME}Export.h")
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}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h")
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
## #################################################################
## Handling of generated script modules
......
src/dtkCore/dtkAbstractContainer 0 → 100644
View file @ d9cc0724
#include "dtkAbstractContainer.h"
\ No newline at end of file
src/dtkCore/dtkAbstractContainer.cpp
View file @ d9cc0724
......@@ -4,9 +4,9 @@
* Copyright (C) 2011 - Thibaud Kloczko, Inria.
* Created: Fri Apr 27 16:15:20 2012 (+0200)
* Version: $Id$
* Last-Updated: Fri Apr 27 16:55:15 2012 (+0200)
* By: tkloczko
* Update #: 8
* Last-Updated: Fri Apr 27 21:10:56 2012 (+0200)
* By: Julien Wintz
* Update #: 10
*/
/* Commentary:
......
src/dtkCore/dtkAbstractContainer.h
View file @ d9cc0724
......@@ -4,9 +4,9 @@
* Copyright (C) 2011 - Thibaud Kloczko, Inria.
* Created: Fri Apr 27 15:25:17 2012 (+0200)
* Version: $Id$
* Last-Updated: Fri Apr 27 17:38:04 2012 (+0200)
* By: tkloczko
* Update #: 43
* Last-Updated: Fri Apr 27 21:11:06 2012 (+0200)
* By: Julien Wintz
* Update #: 45
*/
/* Commentary:
......
src/dtkCore/dtkContainerVector 0 → 100644
View file @ d9cc0724
#include "dtkContainerVector.h"
\ No newline at end of file
src/dtkCore/dtkContainerVector.h
View file @ d9cc0724
......@@ -4,9 +4,9 @@
* Copyright (C) 2011 - Thibaud Kloczko, Inria.
* Created: Fri Apr 27 16:38:14 2012 (+0200)
* Version: $Id$
* Last-Updated: Fri Apr 27 17:36:52 2012 (+0200)
* By: tkloczko
* Update #: 35
* Last-Updated: Fri Apr 27 21:13:12 2012 (+0200)
* By: Julien Wintz
* Update #: 43
*/
/* Commentary:
......@@ -20,8 +20,11 @@
#ifndef DTKCONTAINERVECTOR_H
#define DTKCONTAINERVECTOR_H
#include "dtkCoreExport.h"
#include "dtkAbstractContainer.h"
#include "dtkCoreExport.h"
#include "dtkGlobal.h"
#include <QtCore>
// /////////////////////////////////////////////////////////////////
// dtkContainerVector interface
......@@ -30,8 +33,8 @@
template <typename T> class DTKCORE_EXPORT dtkContainerVector : public dtkAbstractContainer
{
public:
dtkContainerVector(dtkAbstractObject *parent = 0);
dtkContainerVector(const QVector<T>& vector, dtkAbstractObject *parent = 0);
dtkContainerVector(dtkAbstractData *parent = 0);
dtkContainerVector(const QVector<T>& vector, dtkAbstractData *parent = 0);
dtkContainerVector(const dtkContainerVector<T>& other);
~dtkContainerVector(void);
......@@ -54,8 +57,8 @@ public:
void prepend(const QVariant& data);
void remove(const QVariant& data);
void insert(const QVariant data&, dtkxarch_int from, dtkxarch_int length);
void replace(const QVariant data&, dtkxarch_int index);
void insert(const QVariant& data, dtkxarch_int from, dtkxarch_int length);
void replace(const QVariant& data, dtkxarch_int index);
void resize(dtkxarch_int size);
......
src/dtkCore/dtkContainerVector.tpp
View file @ d9cc0724
......@@ -4,9 +4,9 @@
* Copyright (C) 2011 - Thibaud Kloczko, Inria.
* Created: Fri Apr 27 17:02:22 2012 (+0200)
* Version: $Id$
* Last-Updated: Fri Apr 27 17:35:37 2012 (+0200)
* By: tkloczko
* Update #: 45
* Last-Updated: Fri Apr 27 21:16:45 2012 (+0200)
* By: Julien Wintz
* Update #: 54
*/
/* Commentary:
......@@ -24,27 +24,27 @@
// dtkContainerVector implementation
// /////////////////////////////////////////////////////////////////
template <typename T> inline dtkContainerVector<T>::dtkContainerVector(dtkAbstractObject *parent) : dtkAbstractContainer(parent)
template <typename T> dtkContainerVector<T>::dtkContainerVector(dtkAbstractData *parent) : dtkAbstractContainer(parent)
{
};
template <typename T> inline dtkContainerVector<T>::dtkContainerVector(QVector<T> vector, dtkAbstractObject *parent) : dtkAbstractContainer(parent), m_vector(vector)
template <typename T> dtkContainerVector<T>::dtkContainerVector(const QVector<T>& vector, dtkAbstractData *parent) : dtkAbstractContainer(parent), m_vector(vector)
{
};
template <typename T> inline dtkContainerVector<T>::dtkContainerVector(const dtkContainerVector& other) : dtkAbstractContainer(other), m_vector(other.m_vector)
template <typename T> dtkContainerVector<T>::dtkContainerVector(const dtkContainerVector& other) : dtkAbstractContainer(other), m_vector(other.m_vector)
{
};
template <typename T> inline dtkContainerVector<T>::~dtkContainerVector(void)
template <typename T> dtkContainerVector<T>::~dtkContainerVector(void)
{
};
template <typename T> dtkContainerVector& dtkContainerVector<T>::operator = (const dtkContainerVector<T>& other)
template <typename T> dtkContainerVector<T>& dtkContainerVector<T>::operator = (const dtkContainerVector<T>& other)
{
dtkAbstractContainer::operator=(other);
......@@ -123,7 +123,7 @@ template <typename T> inline dtkxarch_int dtkContainerVector<T>::count(void) con
return m_vector.count();
};
template <typename T> inline dtkxarch_int dtkContainerVector<T>::indexOf(const QVariant& data, dtkxarch_int from = 0) const
template <typename T> inline dtkxarch_int dtkContainerVector<T>::indexOf(const QVariant& data, dtkxarch_int from) const
{
return m_vector.indexOf(qvariant_cast<T>(data), from);
};
......@@ -145,12 +145,12 @@ template <typename T> inline QVariant dtkContainerVector<T>::last(void) const
template <typename T> inline bool dtkContainerVector<T>::operator != (const dtkAbstractContainer& other) const
{
return m_vector != other.m_vector;
return true;
};
template <typename T> inline bool dtkContainerVector<T>::operator == (const dtkAbstractContainer& other) const
{
return m_vector == other.m_vector;
return false;
};
template <typename T> inline QVariant dtkContainerVector<T>::operator[] (dtkxarch_int index) const
......
src/dtkCrypto/CMakeLists.txt
View file @ d9cc0724
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Thu Jan 7 10:37:04 2010 (+0100)
## Version: $Id$
## Last-Updated: Mon Apr 16 12:01:37 2012 (+0200)
## Last-Updated: Fri Apr 27 20:58:11 2012 (+0200)
## By: Julien Wintz
## Update #: 49
## Update #: 50
######################################################################
##
### Commentary:
......@@ -83,13 +83,12 @@ generate_export_header(${PROJECT_NAME}
EXPORT_FILE_NAME "${PROJECT_NAME}Export.h")
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}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h")
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
## #################################################################
## Source file layout in development environments like Visual Studio
......
src/dtkDistributed/CMakeLists.txt
View file @ d9cc0724
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Feb 15 09:10:57 2010 (+0100)
## Version: $Id$
## Last-Updated: mar. avril 24 18:17:54 2012 (+0200)
## By: Nicolas Niclausse
## Update #: 242
## Last-Updated: Fri Apr 27 21:05:09 2012 (+0200)
## By: Julien Wintz
## Update #: 243
######################################################################
##
### Commentary:
......@@ -217,13 +217,12 @@ generate_export_header(${PROJECT_NAME}
EXPORT_FILE_NAME "${PROJECT_NAME}Export.h")
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}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h")
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
## #################################################################
## Source file layout in development environments like Visual Studio
......
src/dtkGui/CMakeLists.txt
View file @ d9cc0724
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 22:21:50 2009 (+0200)
## Version: $Id$
## Last-Updated: mar. avril 24 15:45:45 2012 (+0200)
## By: Nicolas Niclausse
## Update #: 247
## Last-Updated: Fri Apr 27 20:56:07 2012 (+0200)
## By: Julien Wintz
## Update #: 248
######################################################################
##
### Commentary:
......@@ -163,13 +163,12 @@ generate_export_header(${PROJECT_NAME}
EXPORT_FILE_NAME "${PROJECT_NAME}Export.h")
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}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h")
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
## #################################################################
## Source file layout in development environments like Visual Studio
......
src/dtkJson/CMakeLists.txt
View file @ d9cc0724
......@@ -4,9 +4,9 @@
## Copyright (C) 2011 - Nicolas Niclausse, Inria.
## Created: ven. août 5 09:57:25 2011 (+0200)
## Version: $Id$
## Last-Updated: Mon Apr 16 12:02:14 2012 (+0200)
## Last-Updated: Fri Apr 27 21:05:10 2012 (+0200)
## By: Julien Wintz
## Update #: 26
## Update #: 27
######################################################################
##
### Commentary:
......@@ -77,13 +77,12 @@ generate_export_header(${PROJECT_NAME}
EXPORT_FILE_NAME "${PROJECT_NAME}Export.h")
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}"
COMMAND ${CMAKE_COMMAND} ARGS -E copy "${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export")
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h")
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}Export.h")
## #################################################################
## 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