diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-10-04 20:29:52 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-10-04 21:24:27 +0300 |
| commit | ea95d042455157fec7930e6cc1599bc46c920cca (patch) | |
| tree | c95a3523a8a222ef4fc6ccce7841075d20ebb960 /intern | |
| parent | 6167a065a5d6eb1db356f4d93f05a9bc315eebb5 (diff) | |
Build: integrate OpenPGL into platform files like other libraries
To avoid issues with install_deps. If we more generally switch to using
CMake configs then perhaps this code can be deduplicated again or at
least simplified.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index ac508e36965..9335024f2eb 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -104,10 +104,6 @@ if(CYCLES_STANDALONE_REPOSITORY) else() unset(_cycles_lib_dir) endif() -else() - if(EXISTS ${LIBDIR}) - set(_cycles_lib_dir ${LIBDIR}) - endif() endif() ########################################################################### @@ -277,7 +273,7 @@ endif() # OpenPGL ########################################################################### -if(WITH_CYCLES_PATH_GUIDING) +if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_PATH_GUIDING) if(EXISTS ${_cycles_lib_dir}) set(openpgl_DIR ${_cycles_lib_dir}/openpgl/lib/cmake/openpgl) endif() @@ -545,7 +541,7 @@ endif() if(CYCLES_STANDALONE_REPOSITORY) if((WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) OR - WITH_CYCLES_HYDRA_RENDER_DELEGATE) + WITH_CYCLES_HYDRA_RENDER_DELEGATE) if(MSVC AND EXISTS ${_cycles_lib_dir}) set(Epoxy_LIBRARIES "${_cycles_lib_dir}/epoxy/lib/epoxy.lib") set(Epoxy_INCLUDE_DIRS "${_cycles_lib_dir}/epoxy/include") |