Commit 369e2381 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[FIX] added fix-cmake option to disable libEEP support. This is required on...

[FIX] added fix-cmake option to disable libEEP support. This is required on windows, since libEEP causes an compiler error in the system header "winnt.h"hg stgrep -ir biosig_en .
parent 771bb53f
...@@ -141,6 +141,7 @@ ADD_SUBDIRECTORY( core ) ...@@ -141,6 +141,7 @@ ADD_SUBDIRECTORY( core )
OPTION( OW_FIX_BOOST_PO_ARG "Enable this to enable the boost::program_options linker fix." ON ) OPTION( OW_FIX_BOOST_PO_ARG "Enable this to enable the boost::program_options linker fix." ON )
OPTION( OW_FIX_EIGENSYSTEM_GCC_PARSE_ERROR "Enable this to disable the eigenSystem module. It causes trouble when using GCC and the latest eigen3 lib." ON ) OPTION( OW_FIX_EIGENSYSTEM_GCC_PARSE_ERROR "Enable this to disable the eigenSystem module. It causes trouble when using GCC and the latest eigen3 lib." ON )
OPTION( OW_FIX_EEP_WINDOWS_ERROR "Enable this to disable the EEP Reader. It causes trouble when in the winnt.h header on Windows." OFF )
# ----------------------------------------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------------------------------------
# QT GUI # QT GUI
......
...@@ -75,14 +75,19 @@ ENDIF() ...@@ -75,14 +75,19 @@ ENDIF()
# ----------------------------------------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------------------------------------
# other external libs # other external libs
SET( OWExtEEPName "openwalnut_eep" ) SET( OWExtEEPName "" )
IF( NOT OW_FIX_EEP_WINDOWS_ERROR )
ADD_DEFINITIONS( "-DWEEP_ENABLED" )
# libcnt needs absolute inclusion somewhere SET( OWExtEEPName "openwalnut_eep" )
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/ext/libeep )
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/ext )
# build external libs in ext/ # libcnt needs absolute inclusion somewhere
ADD_SUBDIRECTORY( ext/libeep) # The needed external libraries INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/ext/libeep )
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/ext )
# build external libs in ext/
ADD_SUBDIRECTORY( ext/libeep ) # The needed external libraries
ENDIF()
# --------------------------------------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------------------------------------
# Setup for compilation # Setup for compilation
......
...@@ -50,9 +50,11 @@ ...@@ -50,9 +50,11 @@
#include "io/WReaderNIfTI.h" #include "io/WReaderNIfTI.h"
#include "io/WReaderELC.h" #include "io/WReaderELC.h"
#include "io/WReaderFiberVTK.h" #include "io/WReaderFiberVTK.h"
#include "io/WReaderLibeep.h"
#include "io/WReaderVTK.h" #include "io/WReaderVTK.h"
#include "io/WPagerEEGLibeep.h" #ifdef WEEP_ENABLED
#include "io/WReaderLibeep.h"
#include "io/WPagerEEGLibeep.h"
#endif
#include "io/WReaderClustering.h" #include "io/WReaderClustering.h"
#include "WMData.h" #include "WMData.h"
...@@ -530,6 +532,7 @@ void WMData::load() ...@@ -530,6 +532,7 @@ void WMData::load()
WReaderEEGASCII eegAsciiLoader( fileName ); WReaderEEGASCII eegAsciiLoader( fileName );
m_dataSet = eegAsciiLoader.load(); m_dataSet = eegAsciiLoader.load();
} }
#ifdef WEEP_ENABLED
else if( suffix == ".cnt" ) else if( suffix == ".cnt" )
{ {
boost::shared_ptr< WPagerEEG > pager( new WPagerEEGLibeep( fileName ) ); boost::shared_ptr< WPagerEEG > pager( new WPagerEEGLibeep( fileName ) );
...@@ -542,6 +545,7 @@ void WMData::load() ...@@ -542,6 +545,7 @@ void WMData::load()
m_dataSet = boost::shared_ptr< WEEG2 >( new WEEG2( pager, eegPositionsLibrary ) ); m_dataSet = boost::shared_ptr< WEEG2 >( new WEEG2( pager, eegPositionsLibrary ) );
} }
#endif
else if( suffix == ".fib" ) else if( suffix == ".fib" )
{ {
WReaderFiberVTK fibReader( fileName ); WReaderFiberVTK fibReader( fileName );
......
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