Commit 382561af authored by Julien Wintz's avatar Julien Wintz
Browse files

Mergin request #100.

parent f462c85b
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 18:30:43 2009 (+0200)
## Version: $Id$
## Last-Updated: 2012 Mon Nov 19 15:55:55 (+0100)
## By: Thibaud Kloczko
## Update #: 392
## Last-Updated: Thu Dec 6 12:55:21 2012 (+0100)
## By: Julien Wintz
## Update #: 394
######################################################################
##
### Commentary:
......@@ -76,9 +76,6 @@ endif(DTK_BUILD_REPORTING)
if(DTK_BUILD_TESTING)
add_subdirectory(tests)
#Set PATH environment in tests
configure_file(cmake/dtkSetTestEnvironment.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/dtkSetTestEnvironment.cmake" @ONLY)
set_directory_properties(PROPERTIES TEST_INCLUDE_FILE dtkSetTestEnvironment.cmake)
endif(DTK_BUILD_TESTING)
if(DTK_BUILD_DOCUMENTATION)
......
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Fri Apr 2 09:04:36 2010 (+0200)
## Version: $Id$
## Last-Updated: Mon Apr 16 10:25:31 2012 (+0200)
## Last-Updated: Thu Dec 6 12:57:36 2012 (+0100)
## By: Julien Wintz
## Update #: 49
## Update #: 55
######################################################################
##
### Commentary:
......@@ -24,12 +24,12 @@ include (InstallRequiredSystemLibraries)
## #################################################################
set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
#GET distribution id
execute_process(COMMAND lsb_release -irs
COMMAND sed "s/ //"
COMMAND sed "s/Fedora/fc/"
COMMAND tr -d '\n' # In Ubuntu the string is Ubuntu\n10.04\n
COMMAND tr -d '\n'
OUTPUT_VARIABLE DISTRIB
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND arch
......
### dtkSetTestEnvironment.cmake.in ---
##
## Author: Julien Wintz
## Copyright (C) 2008-2011 - Julien Wintz, Inria.
## Created: Thu Dec 6 12:55:00 2012 (+0100)
## Version: $Id$
## Last-Updated: Thu Dec 6 12:55:04 2012 (+0100)
## By: Julien Wintz
## Update #: 2
######################################################################
##
### Commentary:
##
######################################################################
##
### Change log:
##
######################################################################
#
# TEST_INCLUDE_FILE for use with tests.
# Sets the PATH environment so that dlls are found.
......@@ -19,7 +38,3 @@ else()
endif()
set(ENV{PATH} "${PATHS_FOR_TESTS}")
message("@CMAKE_CURRENT_BINARY_DIR@/SetTestEnvironment.cmake : Environment for tests is")
message(" PATH=$ENV{PATH}")
#include "dtkComposerNodeLoopDataComposite.h"
\ No newline at end of file
......@@ -4,9 +4,9 @@
* Copyright (C) 2008 - Julien Wintz, Inria.
* Created: Sat Feb 28 17:54:04 2009 (+0100)
* Version: $Id$
* Last-Updated: Tue Sep 25 09:08:56 2012 (+0200)
* By: tkloczko
* Update #: 269
* Last-Updated: Thu Dec 6 12:52:29 2012 (+0100)
* By: Julien Wintz
* Update #: 272
*/
/* Commentary:
......@@ -454,9 +454,8 @@ void dtkAbstractObject::copyMetaDataFrom(const dtkAbstractObject *obj)
if (!obj)
return;
foreach(QString key, obj->metaDataList()) {
foreach(QString key, obj->metaDataList())
this->setMetaData(key, obj->metadatas(key));
}
}
// /////////////////////////////////////////////////////////////////
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2008 - Julien Wintz, Inria.
* Created: Tue Aug 4 12:20:59 2009 (+0200)
* Version: $Id$
* Last-Updated: Tue Oct 23 12:42:47 2012 (+0200)
* Last-Updated: Thu Dec 6 12:49:57 2012 (+0100)
* By: Julien Wintz
* Update #: 280
* Update #: 282
*/
/* Commentary:
......@@ -22,8 +22,6 @@
#include <dtkLog/dtkLog.h>
#define DTK_VERBOSE_LOAD true
// /////////////////////////////////////////////////////////////////
// Helper functions
// /////////////////////////////////////////////////////////////////
......
......@@ -4,9 +4,9 @@
## Copyright (C) 2008-2011 - Julien Wintz, Inria.
## Created: Tue Jun 19 18:23:41 2012 (+0200)
## Version: $Id$
## Last-Updated: 2012 Mon Nov 19 15:45:24 (+0100)
## By: Thibaud Kloczko
## Update #: 5
## Last-Updated: Thu Dec 6 12:56:28 2012 (+0100)
## By: Julien Wintz
## Update #: 9
######################################################################
##
### Commentary:
......@@ -17,6 +17,10 @@
##
######################################################################
configure_file(${CMAKE_SOURCE_DIR}/cmake/dtkSetTestEnvironment.cmake.in "${CMAKE_BINARY_DIR}/dtkSetTestEnvironment.cmake" @ONLY)
set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "${CMAKE_BINARY_DIR}/dtkSetTestEnvironment.cmake")
add_subdirectory(dtkMath)
add_subdirectory(dtkCore)
......
Supports Markdown
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