Clean and correct CMake's ASAN code a bit

Author: AnastaZIuk

CMakeLists.txt

@@ -17,6 +17,7 @@ project(Nabla LANGUAGES CXX C)
 
 option(NBL_STATIC_BUILD "" ON) # ON for static builds, OFF for shared
 option(NBL_DYNAMIC_MSVC_RUNTIME "" OFF)
+option(NBL_SANITIZE_ADDRESS OFF)
 
 if(NBL_STATIC_BUILD)
 	message(STATUS "Static Nabla build enabled!")
@@ -87,9 +88,12 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;")
 set(LLVM_USE_CRT_DEBUG MTd CACHE STRING "Nabla developer note: No idea what subfolder provides this")
 set(LLVM_USE_CRT_RELEASE MT CACHE STRING "Nabla developer note: No idea what subfolder provides this")
 
-unset(CMAKE_CXX_FLAGS_DEBUG CACHE)
-unset(CMAKE_CXX_FLAGS_DEBUG)
-#set(CMAKE_CXX_FLAGS_DEBUG /Zi /Ob0 /Od /MTd)
+if(NBL_SANITIZE_ADDRESS) # get rid of RTC1 flag provided by CMake for Debug and RelWithDebInfo configurations for ASAN purposes
+	unset(CMAKE_CXX_FLAGS_DEBUG CACHE) 
+	unset(CMAKE_CXX_FLAGS_DEBUG)
+	unset(CMAKE_CXX_FLAGS_RELWITHDEBINFO CACHE) 
+	unset(CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+endif()
 
 if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type: Debug or Release" FORCE)
@@ -102,16 +106,6 @@ else()
 endif()
 
 macro(nbl_adjust_flags)
-	option(NBL_SANITIZE_ADDRESS OFF)
-	
-	# test
-	add_compile_options("/fsanitize=adress")
-	add_compile_options("-fsanitize=adress")
-	#add_link_options("/fsanitize=address")
-
-	# TODO: AnastaZIuk please clean it later or somebody
-	#message(FATAL_ERROR "${CMAKE_CXX_FLAGS_DEBUG}")
-	
 	if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 		option(NBL_SANITIZE_THREAD OFF)
 	endif()
@@ -195,11 +189,9 @@ macro(nbl_adjust_flags)
 		endif()
 
 	elseif(MSVC) # /arch:sse3 or anything like this is not needed on x64 on MSVC for enabling sse3 instructions
-		if (NBL_SANITIZE_ADDRESS)
-			set(NBL_MSVC_FLAG_SANITIZE_ADDRESS "/fsanitize=address")
-			#message(WARNING "Due to https://github.com/google/sanitizers/issues/328 expect not to be able to use the Debug target!")
-			set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /wholearchive:clang_rt.asan_dbg-x86_64.lib /wholearchive:clang_rt.asan_cxx_dbg-x86_64.lib -fno-omit-frame-pointer -fsanitize=address")
-			set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /wholearchive:clang_rt.asan-x86_64.lib /wholearchive:clang_rt.asan_cxx-x86_64.lib -fno-omit-frame-pointer -fsanitize=address")
+		if(NBL_SANITIZE_ADDRESS)
+			set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /wholearchive:clang_rt.asan_dbg-x86_64.lib /wholearchive:clang_rt.asan_cxx_dbg-x86_64.lib -fno-omit-frame-pointer -fsanitize=address /fsanitize=address")
+			set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /wholearchive:clang_rt.asan-x86_64.lib /wholearchive:clang_rt.asan_cxx-x86_64.lib -fno-omit-frame-pointer -fsanitize=address /fsanitize=address")
 		endif()
 
 		# debug

cmake/common.cmake

@@ -76,7 +76,9 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
 
 	add_compile_options(${_EXTRA_OPTIONS})
 
-	target_compile_options(${EXECUTABLE_NAME} PUBLIC "-fsanitize=address")
+	if(NBL_SANITIZE_ADDRESS)
+		target_compile_options(${EXECUTABLE_NAME} PUBLIC "-fsanitize=address /fsanitize=address")
+	endif()
 
 	if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 		# add_compile_options("-msse4.2 -mfpmath=sse") ????