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 | |
| 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')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/cmake/macros.cmake | 33 | ||||
| -rw-r--r-- | intern/cycles/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/libmv/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | intern/libmv/bundle.sh | 2 |
5 files changed, 0 insertions, 41 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 50600793854..781639986f6 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -51,8 +51,6 @@ list(APPEND LIBRARIES ${CYCLES_GL_LIBRARIES}) # Common configuration. -cycles_link_directories() - add_definitions(${GL_DEFINITIONS}) include_directories(${INC}) 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}) diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index 634daab5dc1..c6c992008a0 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -38,8 +38,6 @@ set(ALL_CYCLES_LIBRARIES ) include_directories(${INC}) -cycles_link_directories() - set(SRC integrator_adaptive_sampling_test.cpp integrator_render_scheduler_test.cpp diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index 596e8efa082..cd5565fbe16 100644 --- a/intern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt @@ -38,8 +38,6 @@ set(LIB ) if(WITH_LIBMV) - setup_libdirs() - if(WIN32) add_definitions(-D_USE_MATH_DEFINES) endif() diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh index b728d038c5b..fecae324a0a 100755 --- a/intern/libmv/bundle.sh +++ b/intern/libmv/bundle.sh @@ -118,8 +118,6 @@ set(LIB ) if(WITH_LIBMV) - setup_libdirs() - if(WIN32) add_definitions(-D_USE_MATH_DEFINES) endif() |