diff options
| author | Brecht Van Lommel <brecht> | 2022-01-12 21:32:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-01-13 12:40:38 +0300 |
| commit | 29450a2af3dd1f3f52de82cfe689da22a6100e6d (patch) | |
| tree | 9e032e7b7cfaffe5587db3d51e2568987b35e08d /intern/cycles/cmake/macros.cmake | |
| parent | 75a1a578bd5da53fd59ff6bc939ac80b8c65cbc2 (diff) | |
Build: remove usage of link_directories
We are now always using absolute paths for libraries, as recommended by the
CMake docs.
Followup to D9177.
Diffstat (limited to 'intern/cycles/cmake/macros.cmake')
| -rw-r--r-- | intern/cycles/cmake/macros.cmake | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake index 044058a25a8..5619f7bab72 100644 --- a/intern/cycles/cmake/macros.cmake +++ b/intern/cycles/cmake/macros.cmake @@ -84,39 +84,6 @@ macro(cycles_add_library target library_deps) cycles_set_solution_folder(${target}) endmacro() -# Cycles library dependencies common to all executables - -function(cycles_link_directories) - if(APPLE) - # APPLE platform uses full paths for linking libraries, and avoids link_directories. - return() - endif() - - if(WITH_OPENCOLORIO) - link_directories(${OPENCOLORIO_LIBPATH}) - endif() - if(WITH_OPENVDB) - link_directories(${OPENVDB_LIBPATH} ${BLOSC_LIBPATH}) - endif() - if(WITH_OPENSUBDIV) - link_directories(${OPENSUBDIV_LIBPATH}) - endif() - if(WITH_OPENIMAGEDENOISE) - link_directories(${OPENIMAGEDENOISE_LIBPATH}) - endif() - - link_directories( - ${OPENIMAGEIO_LIBPATH} - ${BOOST_LIBPATH} - ${PNG_LIBPATH} - ${JPEG_LIBPATH} - ${ZLIB_LIBPATH} - ${TIFF_LIBPATH} - ${OPENEXR_LIBPATH} - ${OPENJPEG_LIBPATH} - ) -endfunction() - macro(cycles_target_link_libraries target) if(WITH_CYCLES_LOGGING) target_link_libraries(${target} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES}) |