diff --git a/rocclr/CMakeLists.txt b/rocclr/CMakeLists.txt
index 152b28a2ba..122277eec2 100644
--- a/rocclr/CMakeLists.txt
+++ b/rocclr/CMakeLists.txt
@@ -177,7 +177,7 @@ target_include_directories(amdrocclr_static
 
 target_compile_definitions(amdrocclr_static PRIVATE BSD_LIBELF)
 
-if(${USE_COMGR_LIBRARY} MATCHES "yes")
+if(USE_COMGR_LIBRARY)
   # FIXME: This should not be part of the public interface. Downstream
   # users need to add these definitions. This should be defined in a
   # config header here so other builds don't need to be aware of this.
diff --git a/rocclr/device/rocm/CMakeLists.txt b/rocclr/device/rocm/CMakeLists.txt
index fe63dbd2f3..455fd7cc6c 100644
--- a/rocclr/device/rocm/CMakeLists.txt
+++ b/rocclr/device/rocm/CMakeLists.txt
@@ -37,7 +37,7 @@ target_include_directories(oclrocm
     ${ROCR_INCLUDES})
 
 
-if(${USE_COMGR_LIBRARY} MATCHES "yes")
+if(USE_COMGR_LIBRARY)
   target_compile_definitions(oclrocm
     PRIVATE USE_COMGR_LIBRARY)
 endif()