Merge branch 'release/v2.8.2'

Author: DigitalInBlue

CMakeLists.txt

@@ -34,8 +34,17 @@ macro(CeleroSetDefaultCompilerOptions)
 		target_compile_options(${PROJECT_NAME} PRIVATE /MP)
 		target_compile_options(${PROJECT_NAME} PRIVATE /D_SCL_SECURE_NO_WARNINGS)
 		target_compile_options(${PROJECT_NAME} PRIVATE /permissive-)
+
 		if (NOT CELERO_COMPILE_DYNAMIC_LIBRARIES)
-			target_compile_options(${PROJECT_NAME} PRIVATE /MT$<$<CONFIG:Debug>:d>)
+			if(VCPKG_CRT_LINKAGE)
+				if(VCPKG_CRT_LINKAGE STREQUAL "static")
+					target_compile_options(${PROJECT_NAME} PRIVATE /MT$<$<CONFIG:Debug>:d>)
+				else()
+					target_compile_options(${PROJECT_NAME} PRIVATE /MD$<$<CONFIG:Debug>:d>)
+				endif()
+			else()
+				target_compile_options(${PROJECT_NAME} PRIVATE /MD$<$<CONFIG:Debug>:d>)
+			endif()
 		endif()
 
         if(CELERO_TREAT_WARNINGS_AS_ERRORS)