Commit db33988d authored by Alexander Wiebel's avatar Alexander Wiebel

[CHANGE] made new directory ext for external libraries

* moved libeep to ext
* adapted all classes
* adapted build system
parent d2bf6846
...@@ -612,10 +612,10 @@ RECURSIVE = YES ...@@ -612,10 +612,10 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a # excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag. # subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = src/dataHandler/io/nifti \ EXCLUDE = src/ext \
src/dataHandler/io/nifti \
src/dataHandler/io/biosig \ src/dataHandler/io/biosig \
src/dataHandler/io/biosigWin \ src/dataHandler/io/biosigWin \
src/dataHandler/io/libeep \
src/common/platformDependent/visualStudio/inttypes.h \ src/common/platformDependent/visualStudio/inttypes.h \
src/modules/lic/fibernavigator \ src/modules/lic/fibernavigator \
src/modules/lic/fantom src/modules/lic/fantom
......
...@@ -612,10 +612,10 @@ RECURSIVE = YES ...@@ -612,10 +612,10 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a # excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag. # subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = src/dataHandler/io/nifti \ EXCLUDE = src/ext \
src/dataHandler/io/nifti \
src/dataHandler/io/biosig \ src/dataHandler/io/biosig \
src/dataHandler/io/biosigWin \ src/dataHandler/io/biosigWin \
src/dataHandler/io/libeep \
src/common/platformDependent/visualStudio/inttypes.h \ src/common/platformDependent/visualStudio/inttypes.h \
src/modules/lic/fibernavigator \ src/modules/lic/fibernavigator \
src/modules/lic/fantom src/modules/lic/fantom
......
...@@ -147,6 +147,7 @@ ADD_SUBDIRECTORY( gui ) ...@@ -147,6 +147,7 @@ ADD_SUBDIRECTORY( gui )
ADD_SUBDIRECTORY( kernel ) ADD_SUBDIRECTORY( kernel )
ADD_SUBDIRECTORY( common ) ADD_SUBDIRECTORY( common )
ADD_SUBDIRECTORY( modules ) ADD_SUBDIRECTORY( modules )
ADD_SUBDIRECTORY( ext ) # The needed external libraries
#------------------------------------------------------------------------------------------------------------- #-------------------------------------------------------------------------------------------------------------
# Writes information about the revision of the current code to the file version.h which then gets included by OpenWalnut.cpp # Writes information about the revision of the current code to the file version.h which then gets included by OpenWalnut.cpp
...@@ -268,7 +269,7 @@ ADD_CUSTOM_TARGET( numCores ...@@ -268,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/;/dataHandler/io/libeep/avr/;/dataHandler/io/libeep/cnt/;/dataHandler/io/libeep/eep/;/common/platformDependent/visualStudio/;/modules/lic/fibernavigator/;/modules/lic/fantom/" ) 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/" )
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 )
......
# Needed because libeep has includes of form #include <cnt/cnt.h> # Needed because libeep has includes of form #include <cnt/cnt.h>
INCLUDE_DIRECTORIES( io/libeep ) INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/ext/libeep )
ADD_SUBDIRECTORY( io ) ADD_SUBDIRECTORY( io )
ADD_SUBDIRECTORY( datastructures ) ADD_SUBDIRECTORY( datastructures )
FILE( GLOB DATAHANDLER_SRC "*.cpp" "*.h" ) FILE( GLOB DATAHANDLER_SRC "*.cpp" "*.h" )
FILE( GLOB DATAHANDLER_DATASTRUCTURES_SRC "datastructures/*.cpp" "datastructures/*.h" ) FILE( GLOB DATAHANDLER_DATASTRUCTURES_SRC "datastructures/*.cpp" "datastructures/*.h" )
FILE( GLOB DATAHANDLER_EXCEPTIONS_SRC "exceptions/*.cpp" "exceptions/*.h" ) FILE( GLOB DATAHANDLER_EXCEPTIONS_SRC "exceptions/*.cpp" "exceptions/*.h" )
......
...@@ -4,7 +4,6 @@ IF( NOT CMAKE_GENERATOR MATCHES "Visual Studio" ) ...@@ -4,7 +4,6 @@ IF( NOT CMAKE_GENERATOR MATCHES "Visual Studio" )
ELSE () ELSE ()
ADD_SUBDIRECTORY( biosigWin ) ADD_SUBDIRECTORY( biosigWin )
ENDIF() ENDIF()
ADD_SUBDIRECTORY( libeep )
FILE( GLOB DATAHANDLER_IO_SRC "*.cpp" "*.h" ) FILE( GLOB DATAHANDLER_IO_SRC "*.cpp" "*.h" )
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
extern "C" extern "C"
{ {
#include "libeep/cnt/cnt.h" #include "../../ext/libeep/cnt/cnt.h"
} }
#include "../../common/exceptions/WOutOfBounds.h" #include "../../common/exceptions/WOutOfBounds.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
extern "C" extern "C"
{ {
#include "libeep/cnt/cnt.h" #include "../../ext/libeep/cnt/cnt.h"
} }
#include "../../common/WLogger.h" #include "../../common/WLogger.h"
......
This directory contains free software we distribute with OpenWalnut. This software has been created by others and might not be the most recent version available. See the specific subdirectories for the licenses of the codes.
\ No newline at end of file
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