Add global install guard

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()
@@ -140,6 +140,9 @@ MARK_AS_ADVANCED(EMBREE_ZIP_MODE)
 OPTION(EMBREE_INSTALL_DEPENDENCIES "Install Embree dependencies in binary packages and install" OFF)
 MARK_AS_ADVANCED(EMBREE_INSTALL_DEPENDENCIES)
 
+OPTION(EMBREE_INSTALL "Global Embree Install guard" ON)
+MARK_AS_ADVANCED(EMBREE_INSTALL)
+
 OPTION(EMBREE_STAT_COUNTERS "Enables statistic counters.")
 OPTION(EMBREE_STACK_PROTECTOR "When enabled Embree compiles with stack protection against return address overrides." OFF)
 
@@ -688,7 +691,7 @@ ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(kernels)
 ADD_SUBDIRECTORY(tests)
 
-IF (EMBREE_TUTORIALS)
+IF (EMBREE_TUTORIALS MATCHES ON)
   ADD_SUBDIRECTORY(tutorials)
 ENDIF()
 

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

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)

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)
@@ -108,7 +108,9 @@ IF (WIN32)
   SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS TRUE)
   INCLUDE(InstallRequiredSystemLibraries)
   LIST(FILTER CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS INCLUDE REGEX ".*msvcp[0-9]+\.dll|.*vcruntime[0-9]+\.dll|.*vcruntime[0-9]+_[0-9]+\.dll")
-  INSTALL(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
+  IF(EMBREE_INSTALL)
+    INSTALL(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
+  ENDIF()
 
 ELSE()
 
@@ -142,32 +144,36 @@ ENDIF()
 # Install Headers
 ##############################################################
 
-INSTALL(DIRECTORY include/embree4 DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT devel)
-IF (NOT WIN32)
-  INSTALL(DIRECTORY man/man3 DESTINATION "${CMAKE_INSTALL_MANDIR}" COMPONENT devel)
+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)
+  ENDIF()
 ENDIF()
 
 ##############################################################
 # Install Models
 ##############################################################
 
-IF (EMBREE_TUTORIALS)
+IF (EMBREE_TUTORIALS MATCHES ON AND EMBREE_INSTALL MATCHES ON)
   INSTALL(DIRECTORY tutorials/models DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
 ENDIF()
 
 ##############################################################
 # Install Documentation
 ##############################################################
 
-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)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/readme.pdf" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-TBB.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-OIDN.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-DPCPP.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-oneAPI-DPCPP.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
+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)
+  INSTALL(FILES "${PROJECT_SOURCE_DIR}/readme.pdf" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
+  INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
+  INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-TBB.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
+  INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-OIDN.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
+  INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-DPCPP.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
+  INSTALL(FILES "${PROJECT_SOURCE_DIR}/third-party-programs-oneAPI-DPCPP.txt" DESTINATION "${CMAKE_INSTALL_DOCDIR}" COMPONENT lib)
+ENDIF()
 
 ##############################################################
 # Install scripts to set embree paths
@@ -199,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)
@@ -233,8 +239,10 @@ 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)
 
-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)
+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()
 
 ##############################################################
 # CPack specific stuff
@@ -356,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}
-)
+)

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()
+endif()

common/cmake/tutorial.cmake

@@ -9,7 +9,9 @@ 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}")
-  INSTALL(TARGETS embree_${TUTORIAL_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
+  IF(EMBREE_INSTALL MATCHES ON)
+    INSTALL(TARGETS embree_${TUTORIAL_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
+  ENDIF()
   SIGN_TARGET(embree_${TUTORIAL_NAME})
 ENDMACRO ()
 
@@ -21,7 +23,9 @@ 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}")
-    INSTALL(TARGETS embree_${TUTORIAL_NAME}_sycl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
+    IF(EMBREE_INSTALL MATCHES ON)
+      INSTALL(TARGETS embree_${TUTORIAL_NAME}_sycl DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
+    ENDIF()
     SIGN_TARGET(embree_${TUTORIAL_NAME}_sycl)
   ENDIF()
 ENDMACRO ()
@@ -32,7 +36,9 @@ 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}")
-    INSTALL(TARGETS embree_${TUTORIAL_NAME}_ispc DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
+    IF(EMBREE_INSTALL MATCHES ON)
+      INSTALL(TARGETS embree_${TUTORIAL_NAME}_ispc DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
+    ENDIF()
     SIGN_TARGET(embree_${TUTORIAL_NAME}_ispc)
   ENDIF()
 ENDMACRO ()

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)
+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()

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)
+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()

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)
+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()

common/sys/CMakeLists.txt

@@ -25,7 +25,7 @@ IF (EMBREE_SYCL_SUPPORT)
   TARGET_LINK_LIBRARIES(sys ${SYCL_LIB_NAME})
 ENDIF()
 
-IF (EMBREE_STATIC_LIB)
+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()

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)
+        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)
+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()

kernels/CMakeLists.txt

@@ -266,8 +266,10 @@ IF (EMBREE_SYCL_SUPPORT)
     TARGET_LINK_LIBRARIES(embree_sycl PRIVATE rtcore)
   ENDIF()
 
-  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)
+  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()
 
   SET_TARGET_PROPERTIES(embree_sycl PROPERTIES OUTPUT_NAME embree${EMBREE_VERSION_MAJOR}_sycl)
 
@@ -286,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 ()
@@ -299,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)
+  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()
@@ -313,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)
+  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()
@@ -327,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)
+  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()
@@ -341,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)
+  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()
@@ -382,22 +384,24 @@ ELSE()
   SET_TARGET_PROPERTIES(embree PROPERTIES VERSION ${EMBREE_VERSION} SOVERSION ${EMBREE_VERSION_MAJOR})
 ENDIF()
 
-INSTALL(TARGETS embree EXPORT embree-targets
-  LIBRARY NAMELINK_SKIP DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
-  # on Windows put the dlls into bin
-  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples
-  # ... and the import lib into the devel package
-  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel
-)
-
-# export Embree targets
-INSTALL(EXPORT embree-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
-
-# installs libembree4.so link
-IF (NOT EMBREE_STATIC_LIB)
-  INSTALL(TARGETS embree
-    LIBRARY NAMELINK_ONLY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel
+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
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples
+    # ... and the import lib into the devel package
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel
   )
+
+  # export Embree targets
+  INSTALL(EXPORT embree-targets DESTINATION "${EMBREE_CMAKEEXPORT_DIR}" COMPONENT devel)
+
+  # installs libembree4.so link
+  IF (NOT EMBREE_STATIC_LIB)
+    INSTALL(TARGETS embree
+      LIBRARY NAMELINK_ONLY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT devel
+    )
+  ENDIF()
 ENDIF()
 
 SIGN_TARGET(embree)

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)
+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()