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 /build_files/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 'build_files/cmake/macros.cmake')
-rw-r--r-- | build_files/cmake/macros.cmake | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 25a8b66af51..e0219cd1121 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -488,7 +488,6 @@ function(blender_add_test_executable include_directories(${includes}) include_directories(${includes_sys}) - setup_libdirs() BLENDER_SRC_GTEST_EX( NAME ${name} @@ -525,83 +524,6 @@ function(setup_heavy_lib_pool) endif() endfunction() -function(SETUP_LIBDIRS) - - # NOTE: For all new libraries, use absolute library paths. - # This should eventually be phased out. - # APPLE platform uses full paths for linking libraries, and avoids link_directories. - if(NOT MSVC AND NOT APPLE) - link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH}) - - if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs - link_directories(${PYTHON_LIBPATH}) - endif() - if(WITH_SDL AND NOT WITH_SDL_DYNLOAD) - link_directories(${SDL_LIBPATH}) - endif() - if(WITH_CODEC_FFMPEG) - link_directories(${FFMPEG_LIBPATH}) - endif() - if(WITH_IMAGE_OPENEXR) - link_directories(${OPENEXR_LIBPATH}) - endif() - if(WITH_IMAGE_TIFF) - link_directories(${TIFF_LIBPATH}) - endif() - if(WITH_BOOST) - link_directories(${BOOST_LIBPATH}) - endif() - if(WITH_OPENIMAGEIO) - link_directories(${OPENIMAGEIO_LIBPATH}) - endif() - if(WITH_OPENIMAGEDENOISE) - link_directories(${OPENIMAGEDENOISE_LIBPATH}) - endif() - if(WITH_OPENCOLORIO) - link_directories(${OPENCOLORIO_LIBPATH}) - endif() - if(WITH_OPENVDB) - link_directories(${OPENVDB_LIBPATH}) - endif() - if(WITH_OPENAL) - link_directories(${OPENAL_LIBPATH}) - endif() - if(WITH_JACK AND NOT WITH_JACK_DYNLOAD) - link_directories(${JACK_LIBPATH}) - endif() - if(WITH_PULSEAUDIO AND NOT WITH_PULSEAUDIO_DYNLOAD) - link_directories(${LIBPULSE_LIBPATH}) - endif() - if(WITH_CODEC_SNDFILE) - link_directories(${LIBSNDFILE_LIBPATH}) - endif() - if(WITH_FFTW3) - link_directories(${FFTW3_LIBPATH}) - endif() - if(WITH_OPENCOLLADA) - link_directories(${OPENCOLLADA_LIBPATH}) - # # Never set - # link_directories(${PCRE_LIBPATH}) - # link_directories(${EXPAT_LIBPATH}) - endif() - if(WITH_LLVM) - link_directories(${LLVM_LIBPATH}) - endif() - - if(WITH_ALEMBIC) - link_directories(${ALEMBIC_LIBPATH}) - endif() - - if(WITH_GMP) - link_directories(${GMP_LIBPATH}) - endif() - - if(WIN32 AND NOT UNIX) - link_directories(${PTHREADS_LIBPATH}) - endif() - endif() -endfunction() - # Platform specific linker flags for targets. function(setup_platform_linker_flags target) |