diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40935c3692..07a3937f8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,7 @@ ELSE()
   SET(EMBREE_STATIC_LIB ON CACHE BOOL "Build Embree as a static library." FORCE)
   MARK_AS_ADVANCED(EMBREE_STATIC_LIB)
 ENDIF()
-IF (EMBREE_STATIC_LIB)
+IF (EMBREE_STATIC_LIB MATCHES ON)
   SET(EMBREE_LIB_TYPE STATIC)
   ADD_DEFINITIONS(-DEMBREE_STATIC_LIB)
 ELSE()
@@ -691,7 +691,7 @@ ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(kernels)
 ADD_SUBDIRECTORY(tests)
 
-IF (EMBREE_TUTORIALS)
+IF (EMBREE_TUTORIALS MATCHES ON)
   ADD_SUBDIRECTORY(tutorials)
 ENDIF()
 
diff --git a/common/cmake/FindTBB.cmake b/common/cmake/FindTBB.cmake
index 2ff75b9f66..d98f014a51 100644
--- a/common/cmake/FindTBB.cmake
+++ b/common/cmake/FindTBB.cmake
@@ -114,7 +114,7 @@ endmacro()
 macro(rk_tbb_check_components)
   set(_TBB_MISSING_COMPONENTS "")
   set(_TBB_AVAILABLE_COMPONENTS "")
-
+  
   foreach (C IN LISTS _REQUIRED_COMPONENTS)
     if (TARGET TBB::${C})
       list(APPEND _TBB_AVAILABLE_COMPONENTS ${C})
@@ -392,6 +392,7 @@ function(rk_tbb_find_and_link_component COMPONENT_NAME)
   rk_tbb_find_library("${COMPONENT_NAME}" RELEASE)
   rk_tbb_find_library("${COMPONENT_NAME}" DEBUG)
 
+  message(FATAL_ERROR "COMPONENT_TARGET: ${COMPONENT_TARGET}")
   if (${COMPONENT_NAME}_LIBRARY_RELEASE OR ${COMPONENT_NAME}_LIBRARY_DEBUG)
     # Note: We *must* use SHARED here rather than UNKNOWN as our
     #       IMPORTED_NO_SONAME trick a few lines down does not work with
diff --git a/common/cmake/installTBB.cmake b/common/cmake/installTBB.cmake
index d94249f420..015b0b21c4 100644
--- a/common/cmake/installTBB.cmake
+++ b/common/cmake/installTBB.cmake
@@ -1,7 +1,7 @@
 ## Copyright 2009-2021 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
-IF (EMBREE_INSTALL_DEPENDENCIES)
+IF (EMBREE_INSTALL_DEPENDENCIES MATCHES ON)
   IF (TARGET TBB::${EMBREE_TBB_COMPONENT})
     GET_TARGET_PROPERTY(LIB_PATH TBB::${EMBREE_TBB_COMPONENT} IMPORTED_LOCATION_RELEASE)
     IF(WIN32)
diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
index 89078d7fd0..9c472caff3 100644
--- a/common/cmake/package.cmake
+++ b/common/cmake/package.cmake
@@ -24,7 +24,7 @@ ENDIF()
 ##############################################################
 
 # SYCL library
-IF (EMBREE_SYCL_SUPPORT AND EMBREE_INSTALL_DEPENDENCIES)
+IF (EMBREE_SYCL_SUPPORT AND EMBREE_INSTALL_DEPENDENCIES MATCHES ON)
   GET_FILENAME_COMPONENT(DPCPP_COMPILER_DIR ${CMAKE_CXX_COMPILER} PATH)
   
   IF (WIN32)
@@ -91,7 +91,7 @@ ENDIF()
 ##############################################################
 
 IF (WIN32)
-  IF(SYCL_ONEAPI_ICX AND EMBREE_INSTALL_DEPENDENCIES)
+  IF(SYCL_ONEAPI_ICX AND EMBREE_INSTALL_DEPENDENCIES MATCHES ON)
     GET_FILENAME_COMPONENT(DPCPP_COMPILER_DIR ${CMAKE_CXX_COMPILER} PATH)
     IF (EXISTS "${DPCPP_COMPILER_DIR}/../redist/intel64_win/compiler/libmmd.dll")
       INSTALL(FILES "${DPCPP_COMPILER_DIR}/../redist/intel64_win/compiler/libmmd.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
@@ -144,7 +144,7 @@ ENDIF()
 # Install Headers
 ##############################################################
 
-if(EMBREE_INSTALL)
+if(EMBREE_INSTALL MATCHES ON)
   INSTALL(DIRECTORY include/embree4 DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT devel)
   IF (NOT WIN32)
     INSTALL(DIRECTORY man/man3 DESTINATION "${CMAKE_INSTALL_MANDIR}" COMPONENT devel)
@@ -155,7 +155,7 @@ ENDIF()
 # Install Models
 ##############################################################
 
-IF (EMBREE_TUTORIALS AND EMBREE_INSTALL)
+IF (EMBREE_TUTORIALS MATCHES ON AND EMBREE_INSTALL MATCHES ON)
   INSTALL(DIRECTORY tutorials/models DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
 ENDIF()
 
@@ -163,7 +163,7 @@ ENDIF()
 # Install Documentation
 ##############################################################
 
-if(EMBREE_INSTALL)
+if(EMBREE_INSTALL MATCHES ON)
   INSTALL(FILES "${PROJECT_SOURCE_DIR}/LICENSE.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
   INSTALL(FILES "${PROJECT_SOURCE_DIR}/CHANGELOG.md" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
   INSTALL(FILES "${PROJECT_SOURCE_DIR}/README.md" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
@@ -205,7 +205,7 @@ ELSE()
 ENDIF()
 
 # why does this have to be so complicated...
-IF (EMBREE_STATIC_LIB)
+IF (EMBREE_STATIC_LIB MATCHES ON)
   SET(EMBREE_LIBRARY_FULLNAME ${CMAKE_STATIC_LIBRARY_PREFIX}${EMBREE_LIBRARY_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
 ELSE()
   IF (WIN32)
@@ -239,7 +239,7 @@ CONFIGURE_FILE(common/cmake/embree-config-version.cmake embree-config-version.cm
 # create a config file for the build directory
 CONFIGURE_FILE(common/cmake/embree-config-builddir.cmake embree-config.cmake @ONLY)
 
-if(EMBREE_INSTALL)
+if(EMBREE_INSTALL MATCHES ON)
   INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION "${EMBREE_CMAKECONFIG_DIR}" RENAME "embree-config.cmake" COMPONENT devel)
   INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION "${EMBREE_CMAKECONFIG_DIR}" COMPONENT devel)
 ENDIF()
@@ -364,4 +364,4 @@ add_custom_target(
   COMMAND cd ${PROJECT_SOURCE_DIR}/tests/integration/test_embree_release && ${CMAKE_COMMAND} -B build --preset ${EMBREE_TESTING_INTEGRATION_PRESET} -Dembree_DIR="${CMAKE_CURRENT_BINARY_DIR}/embree_install/lib/cmake/embree-${EMBREE_VERSION}"
   COMMAND cd ${PROJECT_SOURCE_DIR}/tests/integration/test_embree_release && ${CMAKE_COMMAND} --build build --config Release
   COMMAND cd ${PROJECT_SOURCE_DIR}/tests/integration/test_embree_release && ${INTEGRATE_BINARY}
-)
\ No newline at end of file
+)
diff --git a/common/cmake/test.cmake b/common/cmake/test.cmake
index 6d59b51c24..826a906d85 100644
--- a/common/cmake/test.cmake
+++ b/common/cmake/test.cmake
@@ -1,10 +1,10 @@
 ## Copyright 2009-2021 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
-if (BUILD_TESTING OR EMBREE_TESTING_INSTALL_TESTS)
+if (BUILD_TESTING MATCHES ON OR EMBREE_TESTING_INSTALL_TESTS MATCHES ON)
 
   INCLUDE(CTest)
 
-  if (EMBREE_TESTING_INSTALL_TESTS)
+  if (EMBREE_TESTING_INSTALL_TESTS MATCHES ON)
     SET(EMBREE_INSTALL_CTESTTESTFILE "${CMAKE_CURRENT_BINARY_DIR}/embree-addtests.cmake")
     file(WRITE "${EMBREE_INSTALL_CTESTTESTFILE}" "")
   endif()
@@ -479,7 +479,7 @@ if (BUILD_TESTING OR EMBREE_TESTING_INSTALL_TESTS)
 
 
 
-    if (EMBREE_TESTING_INSTALL_TESTS)
+    if (EMBREE_TESTING_INSTALL_TESTS MATCHES ON)
       if (inputfile)
         get_filename_component(inputpath ${inputfile} DIRECTORY)
         STRING(REPLACE "${PROJECT_SOURCE_DIR}/" "" inputpath "${inputpath}")
@@ -566,4 +566,4 @@ else()
   ENDFUNCTION()
   FUNCTION(SET_EMBREE_TEST_PROPERTIES testname)
   ENDFUNCTION()
-endif()
\ No newline at end of file
+endif()
diff --git a/common/cmake/tutorial.cmake b/common/cmake/tutorial.cmake
index 19bc85d4ee..a13116d1aa 100644
--- a/common/cmake/tutorial.cmake
+++ b/common/cmake/tutorial.cmake
@@ -9,7 +9,7 @@ MACRO (ADD_TUTORIAL TUTORIAL_NAME)
   TARGET_LINK_LIBRARIES(embree_${TUTORIAL_NAME} embree image tutorial noise ${ADDITIONAL_LIBRARIES})
   SET_PROPERTY(TARGET embree_${TUTORIAL_NAME} PROPERTY FOLDER tutorials/single)
   SET_PROPERTY(TARGET embree_${TUTORIAL_NAME} APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-  IF(EMBREE_INSTALL)
+  IF(EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_${TUTORIAL_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
   ENDIF()
   SIGN_TARGET(embree_${TUTORIAL_NAME})
@@ -23,7 +23,7 @@ MACRO (ADD_TUTORIAL_SYCL TUTORIAL_NAME)
     SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_sycl PROPERTY FOLDER tutorials/sycl)
     SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_sycl APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST} ${CMAKE_CXX_FLAGS_SYCL}")
     SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_sycl APPEND PROPERTY LINK_FLAGS "${CMAKE_LINK_FLAGS_SYCL}")
-    IF(EMBREE_INSTALL)
+    IF(EMBREE_INSTALL MATCHES ON)
       INSTALL(TARGETS embree_${TUTORIAL_NAME}_sycl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
     ENDIF()
     SIGN_TARGET(embree_${TUTORIAL_NAME}_sycl)
@@ -36,7 +36,7 @@ MACRO (ADD_TUTORIAL_ISPC TUTORIAL_NAME)
     TARGET_LINK_LIBRARIES(embree_${TUTORIAL_NAME}_ispc embree image tutorial_ispc noise noise_ispc)
     SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_ispc PROPERTY FOLDER tutorials/ispc)
     SET_PROPERTY(TARGET embree_${TUTORIAL_NAME}_ispc APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-    IF(EMBREE_INSTALL)
+    IF(EMBREE_INSTALL MATCHES ON)
       INSTALL(TARGETS embree_${TUTORIAL_NAME}_ispc DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
     ENDIF()
     SIGN_TARGET(embree_${TUTORIAL_NAME}_ispc)
diff --git a/common/lexers/CMakeLists.txt b/common/lexers/CMakeLists.txt
index 18f75fe5e0..f4834ab177 100644
--- a/common/lexers/CMakeLists.txt
+++ b/common/lexers/CMakeLists.txt
@@ -9,7 +9,7 @@ TARGET_LINK_LIBRARIES(lexers sys math)
 SET_PROPERTY(TARGET lexers PROPERTY FOLDER common)
 SET_PROPERTY(TARGET lexers APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
 
-IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS lexers EXPORT lexers-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
   INSTALL(EXPORT lexers-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
 ENDIF()
diff --git a/common/math/CMakeLists.txt b/common/math/CMakeLists.txt
index 5b8006fc46..157b564c24 100644
--- a/common/math/CMakeLists.txt
+++ b/common/math/CMakeLists.txt
@@ -5,7 +5,7 @@ ADD_LIBRARY(math STATIC constants.cpp)
 SET_PROPERTY(TARGET math PROPERTY FOLDER common)
 SET_PROPERTY(TARGET math APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
 
-IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS math EXPORT math-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
   INSTALL(EXPORT math-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
 ENDIF()
diff --git a/common/simd/CMakeLists.txt b/common/simd/CMakeLists.txt
index 7f954edf51..7bdfd5b1fc 100644
--- a/common/simd/CMakeLists.txt
+++ b/common/simd/CMakeLists.txt
@@ -5,7 +5,7 @@ ADD_LIBRARY(simd STATIC sse.cpp)
 SET_PROPERTY(TARGET simd PROPERTY FOLDER common)
 SET_PROPERTY(TARGET simd APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
 
-IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS simd EXPORT simd-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
   INSTALL(EXPORT simd-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
 ENDIF()
diff --git a/common/sys/CMakeLists.txt b/common/sys/CMakeLists.txt
index ac1cb88a7a..585d150418 100644
--- a/common/sys/CMakeLists.txt
+++ b/common/sys/CMakeLists.txt
@@ -25,7 +25,7 @@ IF (EMBREE_SYCL_SUPPORT)
   TARGET_LINK_LIBRARIES(sys ${SYCL_LIB_NAME})
 ENDIF()
 
-IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS sys EXPORT sys-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
   INSTALL(EXPORT sys-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
 ENDIF()
diff --git a/common/tasking/CMakeLists.txt b/common/tasking/CMakeLists.txt
index b0a8ddc618..8cc19b8549 100644
--- a/common/tasking/CMakeLists.txt
+++ b/common/tasking/CMakeLists.txt
@@ -35,7 +35,7 @@ ELSEIF (TASKING_TBB)
         TARGET_LINK_LIBRARIES(tasking PUBLIC TBB)
         TARGET_INCLUDE_DIRECTORIES(tasking PUBLIC $<BUILD_INTERFACE:${TBB_INCLUDE_DIRS}>)
 
-        IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+        IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
           INSTALL(TARGETS TBB EXPORT TBB-targets)
           INSTALL(EXPORT TBB-targets DESTINATION ${EMBREE_CMAKEEXPORT_DIR} COMPONENT devel)
         ENDIF()
@@ -72,7 +72,8 @@ ENDIF()
 SET_PROPERTY(TARGET tasking PROPERTY FOLDER common)
 SET_PROPERTY(TARGET tasking APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
 
-IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
+  message(FATAL_ERROR "EMBREE_INSTALL: ${EMBREE_INSTALL}")
   INSTALL(TARGETS tasking EXPORT tasking-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
   INSTALL(EXPORT tasking-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
 ENDIF()
diff --git a/kernels/CMakeLists.txt b/kernels/CMakeLists.txt
index 948e49eee9..dc00c03b53 100644
--- a/kernels/CMakeLists.txt
+++ b/kernels/CMakeLists.txt
@@ -266,7 +266,7 @@ IF (EMBREE_SYCL_SUPPORT)
     TARGET_LINK_LIBRARIES(embree_sycl PRIVATE rtcore)
   ENDIF()
 
-  IF(EMBREE_INSTALL)
+  IF(EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_sycl EXPORT embree_sycl-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
     INSTALL(EXPORT embree_sycl-targets DESTINATION ${EMBREE_CMAKEEXPORT_DIR} COMPONENT devel)
   ENDIF()
@@ -288,7 +288,7 @@ ENDIF()
 #  SET_PROPERTY(TARGET embree_sse2 PROPERTY FOLDER kernels)
 #  SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_sse2)
 #  CheckGlobals(embree_sse2)
-#IF (EMBREE_STATIC_LIB)
+#IF (EMBREE_STATIC_LIB MATCHES ON)
 #    INSTALL(TARGETS embree_sse2 ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
 #  ENDIF()
 #ENDIF ()
@@ -301,7 +301,7 @@ IF (EMBREE_ISA_SSE42 AND EMBREE_LIBRARY_FILES_SSE42)
   SET_PROPERTY(TARGET embree_sse42 PROPERTY FOLDER kernels)
   SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_sse42)
   CheckGlobals(embree_sse42)
-  IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+  IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_sse42 EXPORT embree_sse42-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
     INSTALL(EXPORT embree_sse42-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
   ENDIF()
@@ -315,7 +315,7 @@ IF (EMBREE_ISA_AVX  AND EMBREE_LIBRARY_FILES_AVX)
   SET_PROPERTY(TARGET embree_avx PROPERTY FOLDER kernels)
   SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_avx)
   CheckGlobals(embree_avx)
-  IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+  IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_avx EXPORT embree_avx-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
     INSTALL(EXPORT embree_avx-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
   ENDIF()
@@ -329,7 +329,7 @@ IF (EMBREE_ISA_AVX2 AND EMBREE_LIBRARY_FILES_AVX2)
   SET_PROPERTY(TARGET embree_avx2 PROPERTY FOLDER kernels)
   SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_avx2)
   CheckGlobals(embree_avx2)
-  IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+  IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_avx2 EXPORT embree_avx2-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
     INSTALL(EXPORT embree_avx2-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
   ENDIF()
@@ -343,7 +343,7 @@ IF (EMBREE_ISA_AVX512 AND EMBREE_LIBRARY_FILES_AVX512)
   SET_PROPERTY(TARGET embree_avx512 PROPERTY FOLDER kernels)
   SET(EMBREE_LIBRARIES ${EMBREE_LIBRARIES} embree_avx512)
   CheckGlobals(embree_avx512)
-  IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+  IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_avx512 EXPORT embree_avx512-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
     INSTALL(EXPORT embree_avx512-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
   ENDIF()
@@ -384,7 +384,7 @@ ELSE()
   SET_TARGET_PROPERTIES(embree PROPERTIES VERSION ${EMBREE_VERSION} SOVERSION ${EMBREE_VERSION_MAJOR})
 ENDIF()
 
-IF(EMBREE_INSTALL)
+IF(EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS embree EXPORT embree-targets
     LIBRARY NAMELINK_SKIP DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
     # on Windows put the dlls into bin
diff --git a/kernels/level_zero/CMakeLists.txt b/kernels/level_zero/CMakeLists.txt
index 4c15aaa9b0..79c07a5a3d 100644
--- a/kernels/level_zero/CMakeLists.txt
+++ b/kernels/level_zero/CMakeLists.txt
@@ -22,7 +22,7 @@ ENDIF()
 SET_PROPERTY(TARGET ze_wrapper PROPERTY FOLDER common)
 SET_PROPERTY(TARGET ze_wrapper APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
 
-IF (EMBREE_STATIC_LIB AND EMBREE_INSTALL)
+IF (EMBREE_STATIC_LIB MATCHES ON AND EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS ze_wrapper EXPORT ze_wrapper-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel)
   INSTALL(EXPORT ze_wrapper-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
 ENDIF()
diff --git a/kernels/rthwif/CMakeLists.txt b/kernels/rthwif/CMakeLists.txt
index b657f3e3cb..34994fd435 100644
--- a/kernels/rthwif/CMakeLists.txt
+++ b/kernels/rthwif/CMakeLists.txt
@@ -151,7 +151,7 @@ IF (EMBREE_SYCL_RT_VALIDATION_API)
   SET_PROPERTY(TARGET embree_rthwif_sycl APPEND PROPERTY COMPILE_FLAGS "-DEMBREE_SYCL_SUPPORT")
   SET_TARGET_PROPERTIES(embree_rthwif_sycl PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_SYCL})
 
-  IF(EMBREE_INSTALL)
+  IF(EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_rthwif_sycl EXPORT embree_rthwif_sycl-targets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
     INSTALL(EXPORT embree_rthwif_sycl-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
   ENDIF()
@@ -169,7 +169,7 @@ ENDIF()
 
 TARGET_COMPILE_DEFINITIONS(embree_rthwif PUBLIC EMBREE_SYCL_SUPPORT)
 
-IF ((EMBREE_STATIC_LIB OR NOT EMBREE_RTHWIF_STATIC_LIB) AND EMBREE_INSTALL)
+IF ((EMBREE_STATIC_LIB OR NOT EMBREE_RTHWIF_STATIC_LIB) AND EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS embree_rthwif EXPORT ${RTHWIF_NAME}-targets
     LIBRARY NAMELINK_SKIP DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples
diff --git a/kernels/rthwif/package_ze_raytracing.cmake b/kernels/rthwif/package_ze_raytracing.cmake
index a7ee83aaf6..f82be77720 100644
--- a/kernels/rthwif/package_ze_raytracing.cmake
+++ b/kernels/rthwif/package_ze_raytracing.cmake
@@ -7,7 +7,7 @@ INCLUDE(GNUInstallDirs)
 # Install Documentation
 ##############################################################
 
-IF(EMBREE_INSTALL)
+IF(EMBREE_INSTALL MATCHES ON)
   INSTALL(FILES "${PROJECT_SOURCE_DIR}/../../LICENSE.txt" DESTINATION doc COMPONENT lib)
   INSTALL(FILES "${PROJECT_SOURCE_DIR}/../../CHANGELOG.md" DESTINATION doc COMPONENT lib)
   INSTALL(FILES "${PROJECT_SOURCE_DIR}/../../third-party-programs.txt" DESTINATION doc COMPONENT lib)
diff --git a/kernels/rthwif/testing/CMakeLists.txt b/kernels/rthwif/testing/CMakeLists.txt
index 930f0347fa..ec10dd09d7 100644
--- a/kernels/rthwif/testing/CMakeLists.txt
+++ b/kernels/rthwif/testing/CMakeLists.txt
@@ -34,7 +34,7 @@ ADD_EXECUTABLE(embree_rthwif_cornell_box rthwif_cornell_box.cpp)
 TARGET_LINK_LIBRARIES(embree_rthwif_cornell_box sys simd ${TBB_TARGET} ${RT_SIM_LIBRARY} ze_wrapper)
 SET_PROPERTY(TARGET embree_rthwif_cornell_box APPEND PROPERTY COMPILE_FLAGS "-fsycl -fsycl-targets=spir64 -DEMBREE_SYCL_SUPPORT")
 SET_PROPERTY(TARGET embree_rthwif_cornell_box APPEND PROPERTY LINK_FLAGS "-fsycl -fsycl-targets=spir64 -Xsycl-target-backend=spir64 \" -cl-intel-greater-than-4GB-buffer-required \"")
-IF(EMBREE_INSTALL)
+IF(EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS embree_rthwif_cornell_box DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
 ENDIF()
 SIGN_TARGET(embree_rthwif_cornell_box)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 51d810d1c1..ceaa1a28bf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -35,7 +35,7 @@ FOREACH(xml ${PRIMITIVE_TESTS})
 ENDFOREACH()
 
 
-IF (EMBREE_TESTING_INSTALL_TESTS)
+IF (EMBREE_TESTING_INSTALL_TESTS MATCHES ON)
   # test resources
   INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/primitives" DESTINATION "${CMAKE_INSTALL_TESTDIR}/tests" COMPONENT testing PATTERN "*.py" EXCLUDE)
   INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/models" DESTINATION "${CMAKE_INSTALL_TESTDIR}/tests" COMPONENT testing PATTERN "*.py" EXCLUDE)
@@ -114,4 +114,4 @@ IF (EMBREE_TESTING_INSTALL_TESTS)
             DESTINATION "${CMAKE_INSTALL_TESTDIR}"
             COMPONENT testing)
 
-ENDIF()
\ No newline at end of file
+ENDIF()
diff --git a/tests/integration/test_embree_release/CMakeLists.txt b/tests/integration/test_embree_release/CMakeLists.txt
index ce3de53279..0fc4e755c1 100644
--- a/tests/integration/test_embree_release/CMakeLists.txt
+++ b/tests/integration/test_embree_release/CMakeLists.txt
@@ -23,11 +23,11 @@ find_package(embree REQUIRED)
 add_executable(test test.cpp)
 target_link_libraries(test PRIVATE Catch2::Catch2WithMain embree)
 
-if(EMBREE_INSTALL)
+if(EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS test DESTINATION "${CMAKE_INSTALL_BINDIR}")
 ENDIF()
 
-IF(TARGET embree AND EMBREE_INSTALL)
+IF(TARGET embree AND EMBREE_INSTALL MATCHES ON)
   GET_TARGET_PROPERTY(LIB_PATH embree IMPORTED_LOCATION_RELEASE)
   IF(WIN32)
     GET_FILENAME_COMPONENT(LIB_DIR "${LIB_PATH}" DIRECTORY)
diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
index 8949b739d2..37d58dfdc0 100644
--- a/tutorials/CMakeLists.txt
+++ b/tutorials/CMakeLists.txt
@@ -4,7 +4,7 @@
 include(CMakeDependentOption)
 
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/README.md.in" "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-IF(EMBREE_INSTALL)
+IF(EMBREE_INSTALL MATCHES ON)
   INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md" DESTINATION "src" COMPONENT examples)
 ENDIF()
 
diff --git a/tutorials/bvh_access/CMakeLists.txt b/tutorials/bvh_access/CMakeLists.txt
index f0eb832b41..b20551305e 100644
--- a/tutorials/bvh_access/CMakeLists.txt
+++ b/tutorials/bvh_access/CMakeLists.txt
@@ -8,11 +8,11 @@ TARGET_LINK_LIBRARIES(embree_bvh_access embree math sys tasking tutorial)
 
 SET_PROPERTY(TARGET embree_bvh_access PROPERTY FOLDER tutorials/single)
 SET_PROPERTY(TARGET embree_bvh_access APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-IF(EMBREE_INSTALL)
+IF(EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_bvh_access DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
 ENDIF()
 SIGN_TARGET(embree_bvh_access)
 
 ENDIF()
 
-ADD_EMBREE_TEST_ECS(bvh_access embree_bvh_access NO_REFERENCE NO_ISPC NO_SYCL)
\ No newline at end of file
+ADD_EMBREE_TEST_ECS(bvh_access embree_bvh_access NO_REFERENCE NO_ISPC NO_SYCL)
diff --git a/tutorials/convert/CMakeLists.txt b/tutorials/convert/CMakeLists.txt
index f0efb21a52..5d75c8f55a 100644
--- a/tutorials/convert/CMakeLists.txt
+++ b/tutorials/convert/CMakeLists.txt
@@ -5,7 +5,7 @@ ADD_EXECUTABLE(embree_convert ../../kernels/embree.rc convert.cpp distribution1d
 TARGET_LINK_LIBRARIES(embree_convert scenegraph image tasking)
 SET_PROPERTY(TARGET embree_convert PROPERTY FOLDER tutorials/single)
 SET_PROPERTY(TARGET embree_convert APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-IF(EMBREE_INSTALL)
+IF(EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_convert DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
 ENDIF()
 SIGN_TARGET(embree_convert)
diff --git a/tutorials/embree_info/CMakeLists.txt b/tutorials/embree_info/CMakeLists.txt
index 4c7208b0e2..f07e2b3aa4 100644
--- a/tutorials/embree_info/CMakeLists.txt
+++ b/tutorials/embree_info/CMakeLists.txt
@@ -20,7 +20,7 @@ ELSE()
 ENDIF()
 
 SET_PROPERTY(TARGET embree_info PROPERTY FOLDER tutorials/single)
-IF(EMBREE_INSTALL)
+IF(EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS embree_info DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
   #INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DESTINATION "src" COMPONENT examples)
 ENDIF()
@@ -34,5 +34,8 @@ ENDIF()
 IF (COMMAND SIGN_TARGET)
   SIGN_TARGET(embree_info)
 ENDIF()
+<<<<<<< Updated upstream
 
-ADD_EMBREE_GENERIC_TEST(embree_info embree_info)
\ No newline at end of file
+ADD_EMBREE_GENERIC_TEST(embree_info embree_info)
+=======
+>>>>>>> Stashed changes
diff --git a/tutorials/embree_tests/CMakeLists.txt b/tutorials/embree_tests/CMakeLists.txt
index abeab3743b..8d625858a8 100644
--- a/tutorials/embree_tests/CMakeLists.txt
+++ b/tutorials/embree_tests/CMakeLists.txt
@@ -40,10 +40,10 @@ endif()
 
 SET_PROPERTY(TARGET embree_tests PROPERTY FOLDER tutorials)
 SET_PROPERTY(TARGET embree_tests APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-IF(EMBREE_INSTALL)
+IF(EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS embree_tests DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
 ENDIF()
 SIGN_TARGET(embree_tests)
 
 ADD_EMBREE_TEST_ECS(embree_tests embree_tests NO_REFERENCE NO_ISPC NO_SYCL)
-SET_EMBREE_TEST_PROPERTIES(embree_tests PROPERTIES TIMEOUT 7000)
\ No newline at end of file
+SET_EMBREE_TEST_PROPERTIES(embree_tests PROPERTIES TIMEOUT 7000)
diff --git a/tutorials/minimal/CMakeLists.txt b/tutorials/minimal/CMakeLists.txt
index cbebcf8905..8bd1ab7a86 100644
--- a/tutorials/minimal/CMakeLists.txt
+++ b/tutorials/minimal/CMakeLists.txt
@@ -16,7 +16,7 @@ ADD_EXECUTABLE(embree_minimal minimal.cpp)
 TARGET_LINK_LIBRARIES(embree_minimal embree)
 
 SET_PROPERTY(TARGET embree_minimal PROPERTY FOLDER tutorials/single)
-if(EMBREE_INSTALL)
+if(EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS embree_minimal DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
   INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" DESTINATION "src" COMPONENT examples)
 ENDIF()
@@ -34,7 +34,7 @@ IF (EMBREE_SYCL_SUPPORT)
   SET_PROPERTY(TARGET embree_minimal_sycl APPEND PROPERTY LINK_FLAGS    "-fsycl -fsycl-targets=spir64")
   
   SET_PROPERTY(TARGET embree_minimal_sycl PROPERTY FOLDER tutorials/sycl)
-  IF(EMBREE_INSTALL)
+  IF(EMBREE_INSTALL MATCHES ON)
     INSTALL(TARGETS embree_minimal_sycl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
   ENDIF()
   IF (COMMAND SIGN_TARGET)
diff --git a/tutorials/verify/CMakeLists.txt b/tutorials/verify/CMakeLists.txt
index 51f219a100..8c01044eb8 100644
--- a/tutorials/verify/CMakeLists.txt
+++ b/tutorials/verify/CMakeLists.txt
@@ -13,7 +13,7 @@ ADD_EXECUTABLE(embree_verify ../../kernels/embree.rc verify.cpp
 TARGET_LINK_LIBRARIES(embree_verify ${EMBREE_LIBRARIES} sys math scenegraph embree tasking)
 SET_PROPERTY(TARGET embree_verify PROPERTY FOLDER tutorials)
 SET_PROPERTY(TARGET embree_verify APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
-IF(EMBREE_INSTALL)
+IF(EMBREE_INSTALL MATCHES ON)
   INSTALL(TARGETS embree_verify DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
 ENDIF()
 SIGN_TARGET(embree_verify)
@@ -41,4 +41,4 @@ ADD_EMBREE_TEST_ECS(embree_verify_benchmark embree_verify NO_REFERENCE NO_ISPC N
        --skip .*_120.* --skip .*_1k.* --skip .*_10k.* --skip .*100k.*  # skip all smaller build benchmarks
        --run .*embree_reported_memory.*
 )
-SET_EMBREE_TEST_PROPERTIES(embree_verify_benchmarks PROPERTIES TIMEOUT 10800)
\ No newline at end of file
+SET_EMBREE_TEST_PROPERTIES(embree_verify_benchmarks PROPERTIES TIMEOUT 10800)