diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
index fad7f0fec4ce9..c170000bad816 100644
--- a/libclc/CMakeLists.txt
+++ b/libclc/CMakeLists.txt
@@ -85,7 +85,7 @@ set(LIBCLC_TARGET_TO_TEST)
 foreach ( t ${LIBCLC_TEST_TARGETS_ALL})
 	if( ${t} IN_LIST LIBCLC_TARGETS_TO_BUILD )
 		list( APPEND LIBCLC_TARGET_TO_TEST "${t}" )
-	endif(t)
+	endif( ${t} IN_LIST LIBCLC_TARGETS_TO_BUILD )
 endforeach(t)
 
 execute_process( COMMAND ${LLVM_CONFIG} "--system-libs"
diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt
index aab0298c4f388..ad6fc3327db49 100644
--- a/opencl/CMakeLists.txt
+++ b/opencl/CMakeLists.txt
@@ -4,11 +4,11 @@ include(FetchContent)
 
 # Suppress warnings related to dependencies
 if (MSVC)
-add_definitions(
-      -wd4133 # Suppress ''function': incompatible types - from 'char [9]' to 'LPCWSTR''
-      -wd4152 # Suppress 'nonstandard extension, function/data pointer conversion in expression'
-      -wd4201 # Suppress 'nonstandard extension used: nameless struct/union'
-)
+  add_definitions(
+    -wd4133 # Suppress ''function': incompatible types - from 'char [9]' to 'LPCWSTR''
+    -wd4152 # Suppress 'nonstandard extension, function/data pointer conversion in expression'
+    -wd4201 # Suppress 'nonstandard extension used: nameless struct/union'
+  )
 endif()
 
 # Repo URLs
diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
index 5720fcfa6944b..2718ebd141a42 100644
--- a/sycl/CMakeLists.txt
+++ b/sycl/CMakeLists.txt
@@ -49,6 +49,7 @@ if(MSVC)
   # Skip asynchronous C++ exceptions catching and assume "extern C" functions
   # never throw C++ exceptions.
   set(LLVM_REQUIRES_EH ON)
+  set(LLVM_REQUIRES_RTTI ON)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
 
   # Add PDB debug information