Commit efe2be07 authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[CHANGE] merged utils and common

[ADD] some missed documentation of WBresenham_test.h
parent 73c2a372
......@@ -104,7 +104,6 @@ ADD_SUBDIRECTORY( math )
ADD_SUBDIRECTORY( dataHandler )
ADD_SUBDIRECTORY( graphicsEngine )
ADD_SUBDIRECTORY( gui )
ADD_SUBDIRECTORY( utils )
ADD_SUBDIRECTORY( kernel )
ADD_SUBDIRECTORY( common )
ADD_SUBDIRECTORY( modules )
......
......@@ -15,7 +15,7 @@ TARGET_LINK_LIBRARIES( common ${Boost_LIBRARIES} )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${COMMON_SRC}"
"common;utils"
"common"
"WSegmentationFault.cpp"
"WTransferable.cpp"
"WConditionSet.cpp"
......
......@@ -26,7 +26,7 @@
#include <string>
#include <vector>
#include "../utils/WStringUtils.h"
#include "../common/WStringUtils.h"
#include "WColor.h"
WColor::WColor( float red, float green, float blue, float alpha )
......
......@@ -31,7 +31,7 @@
#include <boost/program_options.hpp>
#include "../utils/WIOTools.h"
#include "../common/WIOTools.h"
#include "WProperties.h"
#include "WLogger.h"
......
......@@ -3,6 +3,6 @@ FILE( GLOB COMMON_DATASTRUCTURES_SRC "*.cpp" "*.h" )
# Unit tests
IF( OW_COMPILE_TESTS )
CXXTEST_ADD_TESTS_FROM_LIST( "${COMMON_DATASTRUCTURES_SRC}"
"common;utils" # no libs for linking required
"common" # no libs for linking required
)
ENDIF( OW_COMPILE_TESTS )
......@@ -15,7 +15,7 @@ ELSE()
FILE( GLOB DATAHANDLER_IO_SRC "io/*.cpp" "io/*.h" ) # former WLoader
ADD_LIBRARY( dataHandler SHARED ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} ${DATAHANDLER_IO_SRC} )
TARGET_LINK_LIBRARIES( dataHandler common math utils ${Boost_LIBRARIES} niftiio biosig ${OPENSCENEGRAPH_LIBRARIES})
TARGET_LINK_LIBRARIES( dataHandler common math ${Boost_LIBRARIES} niftiio biosig ${OPENSCENEGRAPH_LIBRARIES})
ENDIF()
# Unit tests
IF( OW_COMPILE_TESTS )
......
......@@ -24,7 +24,7 @@
#include <string>
#include "../utils/WIOTools.h"
#include "../common/WIOTools.h"
#include "WLoader.h"
#include "exceptions/WDHIOFailure.h"
......
......@@ -30,7 +30,7 @@
#include <boost/lexical_cast.hpp>
#include "../../common/WException.h"
#include "../../utils/WStringUtils.h"
#include "../../common/WStringUtils.h"
#include "../WEEG.h"
#include "../WSubject.h"
#include "WLoaderEEGASCII.h"
......
......@@ -32,10 +32,10 @@
#include <boost/lexical_cast.hpp>
#include <boost/shared_ptr.hpp>
#include "../../common/WIOTools.h"
#include "../../common/WLogger.h"
#include "../../common/WStringUtils.h"
#include "../../math/WPosition.h"
#include "../../utils/WIOTools.h"
#include "../../utils/WStringUtils.h"
#include "../WDataSetFibers.h"
#include "../WSubject.h"
#include "WLoaderFibers.h"
......
......@@ -24,7 +24,7 @@
#include <string>
#include "../../utils/WIOTools.h"
#include "../../common/WIOTools.h"
#include "../exceptions/WDHNoSuchFile.h"
#include "WReader.h"
......
......@@ -30,8 +30,8 @@
#include <boost/lexical_cast.hpp>
#include <boost/shared_ptr.hpp>
#include "../../utils/WIOTools.h"
#include "../../utils/WStringUtils.h"
#include "../../common/WIOTools.h"
#include "../../common/WStringUtils.h"
#include "../exceptions/WDHException.h"
#include "../exceptions/WDHIOFailure.h"
#include "WReader.h"
......
......@@ -24,7 +24,7 @@
#include <string>
#include "../../utils/WIOTools.h"
#include "../../common/WIOTools.h"
#include "../exceptions/WDHIOFailure.h"
#include "WWriter.h"
......
......@@ -28,7 +28,7 @@
#include <boost/shared_ptr.hpp>
#include "../../utils/WIOTools.h"
#include "../../common/WIOTools.h"
#include "../WDataSetFibers.h"
#include "../exceptions/WDHIOFailure.h"
#include "WWriterFiberVTK.h"
......
......@@ -29,7 +29,7 @@
#include <boost/shared_ptr.hpp>
#include "../../utils/WIOTools.h"
#include "../../common/WIOTools.h"
#include "../exceptions/WDHIOFailure.h"
#include "WWriterLookUpTableVTK.h"
......
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