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 /source | |
| 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 'source')
| -rw-r--r-- | source/blender/blenlib/tests/performance/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/blentranslation/msgfmt/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/datatoc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 6 |
4 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/blenlib/tests/performance/CMakeLists.txt b/source/blender/blenlib/tests/performance/CMakeLists.txt index 5342dbe286c..036955a4b43 100644 --- a/source/blender/blenlib/tests/performance/CMakeLists.txt +++ b/source/blender/blenlib/tests/performance/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC .. ) -setup_libdirs() include_directories(${INC}) BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib") diff --git a/source/blender/blentranslation/msgfmt/CMakeLists.txt b/source/blender/blentranslation/msgfmt/CMakeLists.txt index 4b8f0878c75..a535d5b8e2d 100644 --- a/source/blender/blentranslation/msgfmt/CMakeLists.txt +++ b/source/blender/blentranslation/msgfmt/CMakeLists.txt @@ -30,7 +30,6 @@ set(SRC msgfmt.c ) -setup_libdirs() add_cc_flags_custom_test(msgfmt) if(WIN32) diff --git a/source/blender/datatoc/CMakeLists.txt b/source/blender/datatoc/CMakeLists.txt index 8411a1a468e..756ab15b163 100644 --- a/source/blender/datatoc/CMakeLists.txt +++ b/source/blender/datatoc/CMakeLists.txt @@ -52,10 +52,6 @@ if(NOT WITH_HEADLESS) endif() include_directories(${PNG_INCLUDE_DIRS}) - if(NOT APPLE) - # APPLE platform uses full paths for linking libraries. - link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH}) - endif() add_executable(datatoc_icon ${SRC}) setup_platform_linker_flags(datatoc_icon) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 816d3a60fc3..7e657abd937 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -18,8 +18,6 @@ # All rights reserved. # ***** END GPL LICENSE BLOCK ***** -setup_libdirs() - blender_include_dirs( ../../intern/clog ../../intern/glew-mx @@ -73,10 +71,6 @@ endif() if(WITH_TBB) blender_include_dirs(${TBB_INCLUDE_DIRS}) - if(NOT APPLE) - # APPLE platform uses full paths for linking libraries. - link_directories(${LIBDIR}/tbb/lib) - endif() endif() |