From 29450a2af3dd1f3f52de82cfe689da22a6100e6d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 12 Jan 2022 19:32:02 +0100 Subject: Build: remove usage of link_directories We are now always using absolute paths for libraries, as recommended by the CMake docs. Followup to D9177. --- source/blender/blenlib/tests/performance/CMakeLists.txt | 1 - source/blender/blentranslation/msgfmt/CMakeLists.txt | 1 - source/blender/datatoc/CMakeLists.txt | 4 ---- 3 files changed, 6 deletions(-) (limited to 'source/blender') 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) -- cgit v1.2.3