Attention une mise à jour du service Gitlab va être effectuée le mardi 30 novembre entre 17h30 et 18h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes. Cette mise à jour intermédiaire en version 14.0.12 nous permettra de rapidement pouvoir mettre à votre disposition une version plus récente.

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

Updating build system. CMake 2.8.6 is now required as dtk uses its built in...

Updating build system. CMake 2.8.6 is now required as dtk uses its built in export header function. Many fixes for CLang compiler.
parent 60e88b48
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 18:30:43 2009 (+0200)
## Version: $Id$
## Last-Updated: Tue Apr 3 12:32:33 2012 (+0200)
## Last-Updated: Mon Apr 16 10:20:37 2012 (+0200)
## By: Julien Wintz
## Update #: 375
## Update #: 378
######################################################################
##
### Commentary:
......@@ -17,13 +17,13 @@
##
######################################################################
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.6)
project(dtk)
set(${PROJECT_NAME}_VERSION_MAJOR 0 CACHE STRING "dtk major 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.")
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
"${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_BUILD}")
......
......@@ -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 3 12:22:39 2012 (+0200)
## Last-Updated: Mon Apr 16 10:31:38 2012 (+0200)
## By: Julien Wintz
## Update #: 201
## Update #: 202
######################################################################
##
### Commentary:
......@@ -17,6 +17,12 @@
##
######################################################################
## #################################################################
##
## #################################################################
include (GenerateExportHeader)
## #################################################################
## Configure cmake variables
## #################################################################
......
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Fri Apr 2 09:04:36 2010 (+0200)
## Version: $Id$
## Last-Updated: Wed Sep 22 16:39:32 2010 (+0200)
## Last-Updated: Mon Apr 16 10:25:31 2012 (+0200)
## By: Julien Wintz
## Update #: 45
## Update #: 49
######################################################################
##
### Commentary:
......@@ -39,7 +39,7 @@ endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}-src")
set(CPACK_PACKAGE_VENDOR "http://www.inria.fr/sophia/dream")
set(CPACK_PACKAGE_CONTACT "Julien Wintz <jwintz@sophia.inria.fr>")
set(CPACK_PACKAGE_CONTACT "Julien Wintz <julien.wintz@inria.fr>")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.txt)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_NAME})
set(CPACK_PACKAGE_DESCRIPTION ${PROJECT_NAME})
......@@ -47,7 +47,6 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${${PROJECT_NAME}_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${${PROJECT_NAME}_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${${PROJECT_NAME}_VERSION_BUILD})
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt)
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
## #################################################################
......@@ -91,6 +90,8 @@ endif(UNIX AND NOT APPLE)
## DEB generator settings
## #################################################################
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libpython2.6 (>= 2.6), libqt4-help (>= 4:4.5.3), libqt4-network (>= 4:4.5.3), libqt4-opengl (>= 4:4.5.3), libqt4-sql (>= 4:4.5.3), libqt4-webkit (>= 4:4.5.3), libqt4-xml (>= 4:4.5.3), libqt4-xmlpatterns (>= 4:4.5.3), libqtcore4 (>= 4:4.6.1), libqtgui4 (>= 4:4.6.1), libssl0.9.8 (>= 0.9.8k-1), libstdc++6 (>= 4.4.0), tcl8.4 (>= 8.4.16)")
# ;
## #################################################################
include(CPack)
......@@ -4,30 +4,35 @@
## Copyright (C) 2008-2011 - Julien Wintz, Inria.
## Created: Thu Sep 1 17:18:46 2011 (+0200)
## Version: $Id$
## Last-Updated: Thu Sep 1 17:20:08 2011 (+0200)
## Last-Updated: Mon Apr 16 10:27:31 2012 (+0200)
## By: Julien Wintz
## Update #: 13
## Update #: 19
######################################################################
##
### Commentary:
##
## Adds precompiled header (pch) support to suitable files.
## Currently only implemented for MSVC. For platforms the macro does nothing.
## Adds precompiled header (pch) support to suitable files. Currently
## only implemented for MSVC. For otherplatforms the macro does
## nothing.
##
## Usage :
## add_precompiled_header(AddedPrecompiledSource PchIncludeFilename PchSourceFilename CandidateSourceFile [CandidateSourceFile1...])
##
## Arguments:
##
## Output :
## AddedPrecompiledSource : variable name that will contain source files
## that need to be added to your target.
## Input :
## AddedPrecompiledSource : variable name that will contain
## source files that need to be added to your target.
##
## Input :
## PchIncludeFilename : name of the header file
## PchSourceFilename : name of the source file used to generate the pch
## CandidateSourceFiles : source file names to which pch support may be added.
## CandidateSourceFiles : source file names to which pch support may be
## added.
##
## Note : Adding a PCH to a file has the considerable side effect
## of implicity forcing #include <pchfile.h> at the start of the file. This may
## have undesired consequences.
## Note : Adding a PCH to a file has the considerable side effect of
## implicity forcing #include <pchfile.h> at the start of the
## file. This may have undesired consequences.
##
######################################################################
##
......
#include "../src/dtkComposer/dtkComposer.h"
#include "../src/dtkComposer/dtkComposerEvaluator.h"
#include "../src/dtkComposer/dtkComposerExport.h"
#include "../src/dtkComposer/dtkComposerFactory.h"
#include "../src/dtkComposer/dtkComposerFactoryView.h"
#include "../src/dtkComposer/dtkComposerGraph.h"
......
......@@ -15,7 +15,6 @@
#include "../src/dtkCore/dtkAbstractViewFactory.h"
#include "../src/dtkCore/dtkAbstractViewInteractor.h"
#include "../src/dtkCore/dtkAbstractViewNavigator.h"
#include "../src/dtkCore/dtkCoreExport.h"
#include "../src/dtkCore/dtkGlobal.h"
#include "../src/dtkCore/dtkPlugin.h"
#include "../src/dtkCore/dtkPluginManager.h"
......
#include "../src/dtkCrypto/dtkCryptoBase64.h"
#include "../src/dtkCrypto/dtkCryptoExport.h"
#include "../src/dtkCrypto/dtkCryptoLicenseManager.h"
......@@ -2,18 +2,22 @@
#include "../src/dtkDistributed/dtkDistributedCommunicatorMpi.h"
#include "../src/dtkDistributed/dtkDistributedCommunicatorTcp.h"
#include "../src/dtkDistributed/dtkDistributedController.h"
#include "../src/dtkDistributed/dtkDistributedControllerFilterView.h"
#include "../src/dtkDistributed/dtkDistributedControllerHeaderView.h"
#include "../src/dtkDistributed/dtkDistributedControllerJobView.h"
#include "../src/dtkDistributed/dtkDistributedControllerStatusModel.h"
#include "../src/dtkDistributed/dtkDistributedControllerStatusModelFilter.h"
#include "../src/dtkDistributed/dtkDistributedControllerStatusModelItem.h"
#include "../src/dtkDistributed/dtkDistributedControllerStatusView.h"
#include "../src/dtkDistributed/dtkDistributedControllerSubmitView.h"
#include "../src/dtkDistributed/dtkDistributedControllerTargetView.h"
#include "../src/dtkDistributed/dtkDistributedControllerTargetViewDelegate.h"
#include "../src/dtkDistributed/dtkDistributedCore.h"
#include "../src/dtkDistributed/dtkDistributedCpu.h"
#include "../src/dtkDistributed/dtkDistributedExport.h"
#include "../src/dtkDistributed/dtkDistributedGpu.h"
#include "../src/dtkDistributed/dtkDistributedJob.h"
#include "../src/dtkDistributed/dtkDistributedMessage.h"
#include "../src/dtkDistributed/dtkDistributedMimeData.h"
#include "../src/dtkDistributed/dtkDistributedNode.h"
#include "../src/dtkDistributed/dtkDistributedServer.h"
#include "../src/dtkDistributed/dtkDistributedServerDaemon.h"
......
......@@ -5,7 +5,6 @@
#include "../src/dtkGui/dtkColorGrid.h"
#include "../src/dtkGui/dtkFinder.h"
#include "../src/dtkGui/dtkFlowLayout.h"
#include "../src/dtkGui/dtkGuiExport.h"
#include "../src/dtkGui/dtkInterpreter.h"
#include "../src/dtkGui/dtkPluginsEditor.h"
#include "../src/dtkGui/dtkPopup.h"
......
#include "../src/dtkJson/dtkJson.h"
#include "../src/dtkJson/dtkJsonExport.h"
#include "../src/dtkLog/dtkLog.h"
#include "../src/dtkLog/dtkLogDestination.h"
#include "../src/dtkLog/dtkLogEngine.h"
#include "../src/dtkLog/dtkLogExport.h"
#include "../src/dtkLog/dtkLogger.h"
#include "../src/dtkLog/dtkLogModel.h"
#include "../src/dtkLog/dtkLogView.h"
#include "../src/dtkMath/dtkMath.h"
#include "../src/dtkMath/dtkMathExport.h"
#include "../src/dtkMath/dtkMatrix.h"
#include "../src/dtkMath/dtkMatrixSquared.h"
#include "../src/dtkMath/dtkQuaternion.h"
......
#include "../src/dtkPlot/dtkPlotCurve.h"
#include "../src/dtkPlot/dtkPlotExport.h"
#include "../src/dtkPlot/dtkPlotRenderer.h"
#include "../src/dtkPlot/dtkPlotView.h"
#include "../src/dtkScript/dtkScriptExport.h"
#include "../src/dtkScript/dtkScriptInterpreter.h"
#include "../src/dtkScript/dtkScriptInterpreterPool.h"
#include "../src/dtkScript/dtkScriptInterpreterPython.h"
......
#include "../src/dtkVr/dtkVrDevice.h"
#include "../src/dtkVr/dtkVrDeviceVrpn.h"
#include "../src/dtkVr/dtkVrExport.h"
#include "../src/dtkVr/dtkVrFlystickRecognizer.h"
#include "../src/dtkVr/dtkVrGestureRecognizer.h"
#include "../src/dtkVr/dtkVrHeadRecognizer.h"
......
#include "../src/dtkZip/dtkZipExport.h"
#include "../src/dtkZip/dtkZipReader.h"
#include "../src/dtkZip/dtkZipWriter.h"
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Fri Sep 4 10:11:02 2009 (+0200)
## Version: $Id$
## Last-Updated: Thu Apr 5 12:27:49 2012 (+0200)
## By: tkloczko
## Update #: 477
## Last-Updated: Mon Apr 16 12:00:50 2012 (+0200)
## By: Julien Wintz
## Update #: 479
######################################################################
##
### Commentary:
......@@ -26,7 +26,6 @@ project(dtkComposer)
set(${PROJECT_NAME}_HEADERS
dtkComposer.h
dtkComposerEvaluator.h
dtkComposerExport.h
dtkComposerFactory.h
dtkComposerFactoryView.h
dtkComposerGraph.h
......@@ -253,6 +252,24 @@ if(MPI_FOUND)
target_link_libraries(${PROJECT_NAME} dtkDistributed)
endif(MPI_FOUND)
## #################################################################
## Export header file
## #################################################################
add_compiler_export_flags()
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}")
set(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_HEADERS}
"${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Export.h")
## #################################################################
## Source file layout in development environments like Visual Studio
## #################################################################
......
#include "dtkComposerExport.h"
\ No newline at end of file
/* dtkComposerExport.h ---
*
* Author: tkloczko
* Copyright (C) 2011 - Thibaud Kloczko, Inria.
* Created: Mon Jan 30 10:36:50 2012 (+0100)
* Version: $Id$
* Last-Updated: Mon Jan 30 10:37:16 2012 (+0100)
* By: tkloczko
* Update #: 1
*/
/* Commentary:
*
*/
/* Change log:
*
*/
#ifndef DTKCOMPOSEREXPORT_H
#define DTKCOMPOSEREXPORT_H
#ifdef WIN32
#ifdef dtkComposer_EXPORTS
#define DTKCOMPOSER_EXPORT __declspec(dllexport)
#else
#define DTKCOMPOSER_EXPORT __declspec(dllimport)
#endif
#else
#define DTKCOMPOSER_EXPORT
#endif
#endif
......@@ -4,9 +4,9 @@
* Copyright (C) 2008-2011 - Julien Wintz, Inria.
* Created: Tue Jan 31 13:22:54 2012 (+0100)
* Version: $Id$
* Last-Updated: Wed Feb 29 01:26:11 2012 (+0100)
* Last-Updated: Mon Apr 16 12:19:00 2012 (+0200)
* By: Julien Wintz
* Update #: 15
* Update #: 17
*/
/* Commentary:
......@@ -20,13 +20,15 @@
#ifndef DTKCOMPOSERFACTORYVIEW_H
#define DTKCOMPOSERFACTORYVIEW_H
#include "dtkComposerExport.h"
#include <QtCore>
#include <QtGui>
class dtkComposerFactory;
class dtkComposerFactoryViewPrivate;
class dtkComposerFactoryView : public QWidget
class DTKCOMPOSER_EXPORT dtkComposerFactoryView : public QWidget
{
Q_OBJECT
......
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