diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..a0cf2d33b0c8c849f7172ba5bb924ca4dad22937 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +HTML +*.bat +*.mat +*.pdf +*.dll +*.exe +*.so* +Thumbs.db +.DS_Store +*.asv +*.wav +*.xlsx +*.docx +*.dll +*.csv +*.h5 +*.ita +*.fig +*.png +*.jpeg +*.sofa +*.spk +*.unv +*.stl +svnaccess +*.lib +*.exp diff --git a/CMakeLists.txt b/CMakeLists.txt index c1ebeded40b2365e8558cd3980ed602ed18b9d15..1fbb83c79c295a4f929e03d0fea419ccfbcf0395 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,6 @@ vista_use_package( ITABASE REQUIRED FIND_DEPENDENCIES ) vista_use_package( ITAFFT REQUIRED FIND_DEPENDENCIES ) vista_use_package( TBB REQUIRED ) - -if( NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC ) - set( ITA_CORE_LIBS_BUILD_STATIC OFF CACHE BOOL "Build all ITA core libs in static mode" ) -endif( NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC ) - # includes include_directories( "include" ) @@ -39,25 +34,20 @@ set( ITAConvolutionSources # compiler settings -if( NOT ITA_CORE_LIBS_BUILD_STATIC ) +if( ITA_VISTA_BUILD_STATIC ) + add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC ) +endif( ) +if( BUILD_SHARED_LIBS ) add_definitions( -DITA_CONVOLUTION_EXPORT ) -else( NOT ITA_CORE_LIBS_BUILD_STATIC ) - add_definitions( -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_CONVOLUTION_STATIC ) - set( BUILD_SHARED_LIBS_TEMP ${BUILD_SHARED_LIBS} ) - if( BUILD_SHARED_LIBS ) - set( BUILD_SHARED_LIBS OFF ) - message( "Ignoring activated BUILD_SHARED_LIBS temporary because static ITA core libs requested" ) - endif( BUILD_SHARED_LIBS ) - set( BUILD_SHARED_LIBS OFF ) -endif( NOT ITA_CORE_LIBS_BUILD_STATIC ) +else( ) + add_definitions( -DITA_CONVOLUTION_STATIC -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC ) +endif( ) # linker add_library( ITAConvolution ${ITAConvolutionHeader} ${ITAConvolutionSources} ) target_link_libraries( ITAConvolution ${VISTA_USE_PACKAGE_LIBRARIES} ) -set( BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_TEMP} ) - # configure vista_configure_lib( ITAConvolution ) @@ -70,5 +60,7 @@ set_property( TARGET ITAConvolution PROPERTY FOLDER "ITACoreLibs" ) # tests -set( ITACONVOLUTION_COMMON_BUILD TRUE ) -add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" ) +if( ITA_CORE_LIBS_WITH_TESTS ) + set( ITACONVOLUTION_COMMON_BUILD TRUE ) + add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" ) +endif( ) diff --git a/LICENSE.md b/LICENSE.md index b29026088c3e78456e77d3dc8b98d9ba940a8ee8..d497aa2358a895980f12b325d3048c8ca0aa8045 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1 +1 @@ -Copyright 2015-2016 Institute of Technical Acoustics, RWTH Aachen University. Any usage and distribution is prohibited, unless explicitly granted by the authors. \ No newline at end of file +Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University. Any usage and distribution is prohibited, unless explicitly granted by the authors. \ No newline at end of file diff --git a/include/DSMBCConvolver.h b/include/DSMBCConvolver.h index 3c5858c7d80665fb9c1bb7c5e672e7ce2b980987..50596b3e621fcaa6485f80b7df3e8532d06f5d35 100644 --- a/include/DSMBCConvolver.h +++ b/include/DSMBCConvolver.h @@ -1,21 +1,20 @@ /* -* ---------------------------------------------------------------- -* -* ITA core libs -* (c) Copyright Institute of Technical Acoustics (ITA) -* RWTH Aachen University, Germany, 2015-2016 -* -* ---------------------------------------------------------------- -* ____ __________ _______ -* // / //__ ___/ // _ | -* // / // / // /_| | -* // / // / // ___ | -* //__/ //__/ //__/ |__| -* -* ---------------------------------------------------------------- -* -*/ -// $Id: DSMBCConvolver.h 2900 2012-09-17 08:42:42Z stienen $ + * ---------------------------------------------------------------- + * + * ITA core libs + * (c) Copyright Institute of Technical Acoustics (ITA) + * RWTH Aachen University, Germany, 2015-2017 + * + * ---------------------------------------------------------------- + * ____ __________ _______ + * // / //__ ___/ // _ | + * // / // / // /_| | + * // / // / // ___ | + * //__/ //__/ //__/ |__| + * + * ---------------------------------------------------------------- + * + */ #ifndef INCLUDE_WATCHER_DSMBC_CONVOLVER #define INCLUDE_WATCHER_DSMBC_CONVOLVER diff --git a/include/DSMBCFilter.h b/include/DSMBCFilter.h index b006811bc72fb8244ce106a7edc31f0913dbf6e2..645d750d1c9c75090a8c3a0855548cadfc014bdd 100644 --- a/include/DSMBCFilter.h +++ b/include/DSMBCFilter.h @@ -1,21 +1,20 @@ /* -* ---------------------------------------------------------------- -* -* ITA core libs -* (c) Copyright Institute of Technical Acoustics (ITA) -* RWTH Aachen University, Germany, 2015-2016 -* -* ---------------------------------------------------------------- -* ____ __________ _______ -* // / //__ ___/ // _ | -* // / // / // /_| | -* // / // / // ___ | -* //__/ //__/ //__/ |__| -* -* ---------------------------------------------------------------- -* -*/ -// $Id: DSMBCFilter.h 2900 2012-09-17 08:42:42Z stienen $ + * ---------------------------------------------------------------- + * + * ITA core libs + * (c) Copyright Institute of Technical Acoustics (ITA) + * RWTH Aachen University, Germany, 2015-2017 + * + * ---------------------------------------------------------------- + * ____ __________ _______ + * // / //__ ___/ // _ | + * // / // / // /_| | + * // / // / // ___ | + * //__/ //__/ //__/ |__| + * + * ---------------------------------------------------------------- + * + */ #ifndef INCLUDE_WATCHER_DSMBC_FILTER #define INCLUDE_WATCHER_DSMBC_FILTER diff --git a/include/DSMBCFilterPool.h b/include/DSMBCFilterPool.h index 4afc08016abef47181b35d3023487722e42df00f..e6dea0539cc710772f172dca9a8c3b141910dfdb 100644 --- a/include/DSMBCFilterPool.h +++ b/include/DSMBCFilterPool.h @@ -1,21 +1,20 @@ /* -* ---------------------------------------------------------------- -* -* ITA core libs -* (c) Copyright Institute of Technical Acoustics (ITA) -* RWTH Aachen University, Germany, 2015-2016 -* -* ---------------------------------------------------------------- -* ____ __________ _______ -* // / //__ ___/ // _ | -* // / // / // /_| | -* // / // / // ___ | -* //__/ //__/ //__/ |__| -* -* ---------------------------------------------------------------- -* -*/ -// $Id: DSMBCFilterPool.h 2900 2012-09-17 08:42:42Z stienen $ + * ---------------------------------------------------------------- + * + * ITA core libs + * (c) Copyright Institute of Technical Acoustics (ITA) + * RWTH Aachen University, Germany, 2015-2017 + * + * ---------------------------------------------------------------- + * ____ __________ _______ + * // / //__ ___/ // _ | + * // / // / // /_| | + * // / // / // ___ | + * //__/ //__/ //__/ |__| + * + * ---------------------------------------------------------------- + * + */ #ifndef INCLUDE_WATCHER_DSMBC_FILTER_POOL #define INCLUDE_WATCHER_DSMBC_FILTER_POOL diff --git a/include/DSMBCTrigger.h b/include/DSMBCTrigger.h index 49ea0a94d71ae704be52592a8f0c56e7aeb015c5..0b069c16795784262353726a1ff3a18d6ff516a6 100644 --- a/include/DSMBCTrigger.h +++ b/include/DSMBCTrigger.h @@ -1,21 +1,20 @@ /* -* ---------------------------------------------------------------- -* -* ITA core libs -* (c) Copyright Institute of Technical Acoustics (ITA) -* RWTH Aachen University, Germany, 2015-2016 -* -* ---------------------------------------------------------------- -* ____ __________ _______ -* // / //__ ___/ // _ | -* // / // / // /_| | -* // / // / // ___ | -* //__/ //__/ //__/ |__| -* -* ---------------------------------------------------------------- -* -*/ -// $Id: ITAConvolution.h 2900 2012-09-17 08:42:42Z stienen $ + * ---------------------------------------------------------------- + * + * ITA core libs + * (c) Copyright Institute of Technical Acoustics (ITA) + * RWTH Aachen University, Germany, 2015-2017 + * + * ---------------------------------------------------------------- + * ____ __________ _______ + * // / //__ ___/ // _ | + * // / // / // /_| | + * // / // / // ___ | + * //__/ //__/ //__/ |__| + * + * ---------------------------------------------------------------- + * + */ #ifndef INCLUDE_WATCHER_DSMBC_TRIGGER #define INCLUDE_WATCHER_DSMBC_TRIGGER diff --git a/include/ITAConvolution.h b/include/ITAConvolution.h index 82c6240274a308c3c6a294de04081a97667fae19..6e4f934f90bf016e027745c7c458446506fe6165 100644 --- a/include/ITAConvolution.h +++ b/include/ITAConvolution.h @@ -1,21 +1,20 @@ /* -* ---------------------------------------------------------------- -* -* ITA core libs -* (c) Copyright Institute of Technical Acoustics (ITA) -* RWTH Aachen University, Germany, 2015-2016 -* -* ---------------------------------------------------------------- -* ____ __________ _______ -* // / //__ ___/ // _ | -* // / // / // /_| | -* // / // / // ___ | -* //__/ //__/ //__/ |__| -* -* ---------------------------------------------------------------- -* -*/ -// $Id: ITAConvolution.h 2900 2012-09-17 08:42:42Z stienen $ + * ---------------------------------------------------------------- + * + * ITA core libs + * (c) Copyright Institute of Technical Acoustics (ITA) + * RWTH Aachen University, Germany, 2015-2017 + * + * ---------------------------------------------------------------- + * ____ __________ _______ + * // / //__ ___/ // _ | + * // / // / // /_| | + * // / // / // ___ | + * //__/ //__/ //__/ |__| + * + * ---------------------------------------------------------------- + * + */ #ifndef INCLUDE_WATCHER_ITA_CONVOLUTION #define INCLUDE_WATCHER_ITA_CONVOLUTION diff --git a/include/ITAConvolutionDefinitions.h b/include/ITAConvolutionDefinitions.h index deef2ed0735208db7f167e1754e670622c5ac78e..85a89a00557a20e8fe6c7ff2ca5bf81419d80f81 100644 --- a/include/ITAConvolutionDefinitions.h +++ b/include/ITAConvolutionDefinitions.h @@ -3,7 +3,7 @@ * * ITA core libs * (c) Copyright Institute of Technical Acoustics (ITA) - * RWTH Aachen University, Germany, 2015-2016 + * RWTH Aachen University, Germany, 2015-2017 * * ---------------------------------------------------------------- * ____ __________ _______ diff --git a/src/ITAConvolutionImpl.h b/src/ITAConvolutionImpl.h index 130dfcd0ebc431058cccf8da40e9d6d58c562c5a..3746e60c76c962b8d4f25f07c0ad1f2bcbd56403 100644 --- a/src/ITAConvolutionImpl.h +++ b/src/ITAConvolutionImpl.h @@ -1,5 +1,3 @@ -// $Id: ITAConvolutionImpl.h,v 1.1 2010-04-21 21:15:14 fwefers Exp $ - #ifndef __ITA_CONVOLUTION_IMPL_H__ #define __ITA_CONVOLUTION_IMPL_H__ diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a5b039d2447421bf92296111fff79d78106b29fa..4cb27139c2135fe77782187620088b00bb703892 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,18 +1,14 @@ cmake_minimum_required( VERSION 2.8 ) -if( NOT ITACONVOLUTION_COMMON_BUILD ) - - project( ITAConvolutionTests ) - list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" ) - include( VistaCommon ) - -endif() +project( ITAConvolutionTests ) +list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" ) +include( VistaCommon ) vista_use_package( ITAConvolution REQUIRED FIND_DEPENDENCIES ) -if( NOT ITA_CORE_LIBS_BUILD_STATIC AND NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC ) +if( NOT ITA_CORE_LIBS_BUILD_STATIC ) add_definitions( -DITA_BASE_STATIC -DITA_FFT_STATIC -DITA_CONVOLUTION_STATIC ) -endif( NOT ITA_CORE_LIBS_BUILD_STATIC AND NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC ) +endif( ) add_executable( ITAConvolutionTest "ITAConvolutionTest.cpp" ) target_link_libraries( ITAConvolutionTest ${VISTA_USE_PACKAGE_LIBRARIES} )