chore: integrate release 2.3.1 (#215)

nfrechette · Mar 16, 2024 · af1b94c · af1b94c
2 parents 26a4d04 + bbbfb70
commit af1b94c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Significant changes per release
 
+## 2.3.1
+
+*  Fix missing macro error when deprecation is disabled
+
 ## 2.3.0
 
 *  Added missing 2D/4D variants of some vector arithmetic

diff --git a/cmake/CMakeCompiler.cmake b/cmake/CMakeCompiler.cmake
@@ -17,7 +17,8 @@ macro(setup_default_compiler_flags _project_name)
 		target_compile_options(${_project_name} PRIVATE /Zi)				# Add debug info
 		target_compile_options(${_project_name} PRIVATE /Oi)				# Generate intrinsic functions
 		target_compile_options(${_project_name} PRIVATE /WX)				# Treat warnings as errors
-		if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") # no Clang no Intel
+
+		if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") # no Intel
 			target_compile_options(${_project_name} PRIVATE /MP)            # Enable parallel compilation
 		endif ()
 

diff --git a/includes/rtm/impl/detect_compiler.h b/includes/rtm/impl/detect_compiler.h
@@ -30,7 +30,7 @@
 #if defined(__GNUG__) && !defined(__clang__)
 	#define RTM_COMPILER_GCC
 #elif defined(__clang__)
-	#define RTM_COMPILER_CLANG
+	#define RTM_COMPILER_CLANG		__clang_major__
 #elif defined(_MSC_VER) && !defined(__clang__)
 	#define RTM_COMPILER_MSVC		_MSC_VER
 	#define RTM_COMPILER_MSVC_2013	1800

diff --git a/includes/rtm/impl/error.h b/includes/rtm/impl/error.h
@@ -198,10 +198,13 @@ RTM_IMPL_FILE_PRAGMA_PUSH
 			#define RTM_DEPRECATED(msg) __attribute__((deprecated))
 		#elif defined(RTM_COMPILER_MSVC)
 			#define RTM_DEPRECATED(msg) __declspec(deprecated)
-		#else
-			#define RTM_DEPRECATED(msg)
 		#endif
 	#endif
 #endif
 
+// If not defined, suppress all deprecation warnings
+#if !defined(RTM_DEPRECATED)
+	#define RTM_DEPRECATED(msg)
+#endif
+
 RTM_IMPL_FILE_PRAGMA_POP