Commit 616b2a8a authored by Alexander Wiebel's avatar Alexander Wiebel

[CHANGE] moved nifti to ext

* adapted corresponding classes
* adapted build system
parent 0fe14146
...@@ -269,7 +269,7 @@ ADD_CUSTOM_TARGET( numCores ...@@ -269,7 +269,7 @@ ADD_CUSTOM_TARGET( numCores
FILE( GLOB_RECURSE STYLE_CPP ${PROJECT_SOURCE_DIR}/*.cpp ) FILE( GLOB_RECURSE STYLE_CPP ${PROJECT_SOURCE_DIR}/*.cpp )
FILE( GLOB_RECURSE STYLE_H ${PROJECT_SOURCE_DIR}/*.h ) FILE( GLOB_RECURSE STYLE_H ${PROJECT_SOURCE_DIR}/*.h )
# Set dirs to exclude from stylecheck # Set dirs to exclude from stylecheck
SET( EXCLUDE_DIRS "/dataHandler/io/nifti/;/dataHandler/io/biosig/;/dataHandler/io/biosigWin/;/dataHandler/io/biosig/XMLParser/;/dataHandler/io/biosigWin/XMLParser/;/ext/libeep/avr/;/ext/libeep/cnt/;/ext/libeep/eep/;/common/platformDependent/visualStudio/;/modules/lic/fibernavigator/;/modules/lic/fantom/" ) SET( EXCLUDE_DIRS "/ext/nifti/;/dataHandler/io/biosig/;/dataHandler/io/biosigWin/;/dataHandler/io/biosig/XMLParser/;/dataHandler/io/biosigWin/XMLParser/;/ext/libeep/avr/;/ext/libeep/cnt/;/ext/libeep/eep/;/common/platformDependent/visualStudio/;/modules/lic/fibernavigator/;/modules/lic/fantom/" )
FOREACH( dirname ${EXCLUDE_DIRS} ) FOREACH( dirname ${EXCLUDE_DIRS} )
FILE( GLOB EXCLUDE_H ${PROJECT_SOURCE_DIR}${dirname}*.h ) FILE( GLOB EXCLUDE_H ${PROJECT_SOURCE_DIR}${dirname}*.h )
FILE( GLOB EXCLUDE_CPP ${PROJECT_SOURCE_DIR}${dirname}*.cpp ) FILE( GLOB EXCLUDE_CPP ${PROJECT_SOURCE_DIR}${dirname}*.cpp )
......
ADD_SUBDIRECTORY( nifti )
IF( NOT CMAKE_GENERATOR MATCHES "Visual Studio" ) IF( NOT CMAKE_GENERATOR MATCHES "Visual Studio" )
ADD_SUBDIRECTORY( biosig ) ADD_SUBDIRECTORY( biosig )
ELSE () ELSE ()
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "../WDataSet.h" #include "../WDataSet.h"
#include "../../common/math/WMatrix.h" #include "../../common/math/WMatrix.h"
#include "nifti/nifti1_io.h" #include "../../ext/nifti/nifti1_io.h"
/** /**
* Reader for the NIfTI file format. For NIfTI just see http://nifti.nimh.nih.gov/. * Reader for the NIfTI file format. For NIfTI just see http://nifti.nimh.nih.gov/.
......
# Needed because libeep has includes of form #include <cnt/cnt.h> # Needed because libeep has includes of form #include <cnt/cnt.h>
INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/ext/libeep ) INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/ext/libeep )
ADD_SUBDIRECTORY( libeep ) ADD_SUBDIRECTORY( libeep )
\ No newline at end of file ADD_SUBDIRECTORY( nifti )
\ No newline at end of file
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "../../kernel/WKernel.h" #include "../../kernel/WKernel.h"
#include "../../common/math/WPosition.h" #include "../../common/math/WPosition.h"
#include "../../common/math/WVector3D.h" #include "../../common/math/WVector3D.h"
#include "../../dataHandler/io/nifti/nifti1_io.h" #include "../../ext/nifti/nifti1_io.h"
#include "WMWriteNIfTI.h" #include "WMWriteNIfTI.h"
// This line is needed by the module loader to actually find your module. // This line is needed by the module loader to actually find your module.
......
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