blender/cycles
8
16
Fork 11
Code Issues 3 Pull Requests 5 Releases Activity

Toggle for precompiled dependencies #13

Merged
Brecht Van Lommel merged 2 commits from boberfly/cycles:precompiledDepsToggle into main 2024-08-09 15:16:43 +02:00
Conversation 0 Commits 2 Files Changed 2 +9 -2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a5b969aa4 - Show all commits

3
CMakeLists.txt
View File

@ -92,6 +92,9 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
########################################################################### ###########################################################################
# Options. # Options.
# Use precompiled dependencies
option(WITH_CYCLES_DEPENDENCIES "Use precompiled dependencies" ON)
# Library dependencies # Library dependencies
option(WITH_CYCLES_ALEMBIC "Build with Alembic procedural support" ON) option(WITH_CYCLES_ALEMBIC "Build with Alembic procedural support" ON)
option(WITH_CYCLES_EMBREE "Build with Embree support" ON) option(WITH_CYCLES_EMBREE "Build with Embree support" ON)

8
src/cmake/external_libs.cmake
View File

@ -67,7 +67,7 @@ else()
endif() endif()
endif() endif()
if(EXISTS ${_cycles_lib_dir}) if(EXISTS ${_cycles_lib_dir} AND WITH_CYCLES_DEPENDENCIES)
message(STATUS "Using precompiled libraries at ${_cycles_lib_dir}") message(STATUS "Using precompiled libraries at ${_cycles_lib_dir}")
_set_default(ALEMBIC_ROOT_DIR "${_cycles_lib_dir}/alembic") _set_default(ALEMBIC_ROOT_DIR "${_cycles_lib_dir}/alembic")
@ -118,7 +118,11 @@ if(EXISTS ${_cycles_lib_dir})
# Ignore system libraries # Ignore system libraries
set(CMAKE_IGNORE_PATH "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES};${CMAKE_SYSTEM_INCLUDE_PATH};${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES};${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}") set(CMAKE_IGNORE_PATH "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES};${CMAKE_SYSTEM_INCLUDE_PATH};${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES};${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")
else() else()
message(STATUS "No precompiled libraries found at ${_cycles_lib_dir}") if(NOT WITH_CYCLES_DEPENDENCIES)
message(STATUS "Not using precompiled libraries")
else()
message(STATUS "No precompiled libraries found at ${_cycles_lib_dir}")
endif()
message(STATUS "Attempting to use system libraries instead") message(STATUS "Attempting to use system libraries instead")
unset(_cycles_lib_dir) unset(_cycles_lib_dir)
endif() endif()