Merge branch 'release/2023a'

.cmake-format

@@ -158,6 +158,57 @@ with section("parse"):
     },
     'groupsourcesbyfolder': {
       'spelling': 'GroupSourcesByFolder'
+    },
+    'ihta_add_library' : {
+      'pargs' : {
+        'nargs' : '*',
+        'flags' : []
+      },
+      'spelling': 'ihta_add_library',
+      'kwargs': {
+        'TEST_INTERNALS' : 0,
+        'NAMESPACE' : 1,
+        'NAME' : 1,
+        'LIBRARY_TYPE' : 1,
+        'INCLUDE_DIR' : 1,
+        'SRC_DIR' : 1,
+        'INSTALL_INCLUDE_DIR' : 1,
+        'IDE_FOLDER' : 1,
+        'OBJECT_LIB_POSTFIX' : '?',
+        'OUT_LIB' : 1,
+        'OUT_TEST' : 1,
+        'SOURCES' : '+',
+        'TEST_SOURCES' : '*'
+      }
+    },
+    'ihta_add_test' : {
+      'pargs' : {
+        'nargs' : '*',
+        'flags' : []
+      },
+      'spelling': 'ihta_add_test',
+      'kwargs': {
+        'NAME' : 1,
+        'TEST_TARGET' : 1,
+        'IDE_FOLDER' : 1,
+        'SOURCES' : '+',
+        'COV_SOURCES' : '*'
+      }
+    },
+    'build_doc' : {
+      'pargs' : { 
+        'nargs' : '*',
+        'flags' : [] 
+      },
+      'spelling': 'build_doc',
+      'kwargs': {
+        'SIDEBAR_ONLY' : 0,
+        'README_MAINPAGE' : 1,
+        'COLOR_STYLE' : 1,
+        'LOGO' : 1,
+        'ADD_DEV_SECTION' : 1,
+        'SOURCES' : '*'
+      }
     }
   }
 

CMakeLists.txt

 cmake_minimum_required (VERSION 3.20 FATAL_ERROR)
 
+init_project ()
+
 project (
 	ITAPropagationModels
-	VERSION 2022.0
+	VERSION 2023.0
 	LANGUAGES CXX C
 )
 
-set (CMAKE_DEBUG_POSTFIX "-d")
-set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-if (NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY AND WIN32)
-	set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/bin)
-	set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/lib)
-	set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/lib)
-endif ()
-
-# Organize targest in folders in Visual Studio
-if (CMAKE_GENERATOR MATCHES "Visual Studio")
-	set_property (GLOBAL PROPERTY USE_FOLDERS ON)
-endif ()
-
 # Options
 option (ITA_PROPAGATION_MODELS_WITH_TESTS "Build the tests for the library" OFF)
 option (ITA_PROPAGATION_MODELS_WITH_BENCHMARKS "Build the benchmarks for the library" OFF)
 
 # Library
-add_library (
-	${PROJECT_NAME}
-	include/ITAPropagationModels/Base.h
+ihta_add_library (
+	NAME ${PROJECT_NAME}
+	SOURCES include/ITAPropagationModels/Base.h
 			include/ITAPropagationModels/Definitions.h
 			include/ITAPropagationModels/FilterEngine.h
 			include/ITAPropagationModels/Maekawa.h
@@ -41,37 +29,26 @@ add_library (
 			src/ITAPropagationModels/UTD.cpp
 			src/ITAPropagationModels/Utils.cpp
 			src/ITAPropagationModels/Atmosphere/AirAttenuation.cpp
-)
-add_library (${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
-
-# Set include directory for library
-target_include_directories (
-	${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-						   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+	NAMESPACE ${PROJECT_NAME}
+	IDE_FOLDER "ITAGeometricalAcoustics"
+	OUT_LIB LIB_TARGET
 )
 
 # Linking
 target_link_libraries (
-	${PROJECT_NAME}
+	${LIB_TARGET}
 	PUBLIC ITABase::ITABase ITAGeo::ITAGeo ITAPropagationPathSim::ITAPropagationPathSim
 	PRIVATE ITAFFT::ITAFFT Spline::spline
 )
 
 # Definitions for Shared/Static
 target_compile_definitions (
-	${PROJECT_NAME}
+	${LIB_TARGET}
 	PUBLIC $<IF:$<BOOL:${BUILD_SHARED_LIBS}>,ITA_PROPAGATION_MODELS_EXPORT,ITA_PROPAGATION_MODELS_STATIC>
 )
-# Required compiler features
-target_compile_features (${PROJECT_NAME} PUBLIC cxx_std_17)
-
-# If build out of ITAGeometricalAcoustics project, add parent folder "ITAGeometricalAcoustics"
-if (NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-	set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "ITAGeometricalAcoustics")
-endif ()
 
 # Organize sources in folders
-GroupSourcesByFolder (${PROJECT_NAME})
+GroupSourcesByFolder (${LIB_TARGET})
 
 # Install & export
 packageProject (

README.md

@@ -5,7 +5,7 @@ ITAPropagationModels turns abstract sound propagation paths into acoustic filter
 
 ### License
 
-Copyright 2015-2022 Institute of Technical Acoustics (ITA), RWTH Aachen University
+Copyright 2015-2023 Institute of Technical Acoustics (ITA), RWTH Aachen University
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use files of this project except in compliance with the License.

benchmarks/DiffractionModelsBenchmark.cpp

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______

include/ITAPropagationModels/Atmosphere/AirAttenuation.h

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  *				    ____  __________  _______

include/ITAPropagationModels/Base.h

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______

include/ITAPropagationModels/Definitions.h

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  *				    ____  __________  _______

include/ITAPropagationModels/FilterEngine.h

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  *				    ____  __________  _______

include/ITAPropagationModels/Maekawa.h

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  *				    ____  __________  _______

include/ITAPropagationModels/Svensson.h

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  *				    ____  __________  _______

include/ITAPropagationModels/UTD.h

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  *				    ____  __________  _______

include/ITAPropagationModels/Utils.h

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______

tests/AtmosphericAttenuationTest/AtmosphericAttenuationTest.cpp

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______

tests/FilterEngine/FilterEngineTest.cpp

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______

tests/Maekawa/MaekawaTest.cpp

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______

tests/ReceiverDirectivityTest/ReceiverDirectivityTest.cpp

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______

tests/SourceDirectivityTest/SourceDirectivityTest.cpp

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______

tests/Svensson/SvenssonTest.cpp

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______

tests/UTD/UTDTest.cpp

@@ -3,7 +3,7 @@
  *
  *		ITA geometrical acoustics
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2022
+ *		RWTH Aachen University, Germany, 2015-2023
  *
  * ----------------------------------------------------------------
  * 				    ____  __________  _______