diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-03-15 05:15:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-15 05:15:26 +0300 |
| commit | ca22dbe2a2194a952b32ec807cec25010ce1a05d (patch) | |
| tree | 65fef1fdf8ec50c64fa7070005736d6f1ffce3f3 /build_files | |
| parent | 7db79ae57a3c119c382c0be375b79c3ce687a93d (diff) | |
CMake: remove unused libpath's
Also add note that these should be deprecated in favor of absolute libs.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index df0c3651c77..c9cee9208ab 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -256,6 +256,9 @@ endfunction() function(SETUP_LIBDIRS) + # NOTE: For all new libraries, use absolute library paths. + # This should eventually be phased out. + link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH}) if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs @@ -285,12 +288,6 @@ function(SETUP_LIBDIRS) if(WITH_OPENVDB) link_directories(${OPENVDB_LIBPATH}) endif() - if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG) - link_directories(${OPENJPEG_LIBPATH}) - endif() - if(WITH_CODEC_QUICKTIME) - link_directories(${QUICKTIME_LIBPATH}) - endif() if(WITH_OPENAL) link_directories(${OPENAL_LIBPATH}) endif() @@ -305,15 +302,13 @@ function(SETUP_LIBDIRS) endif() if(WITH_OPENCOLLADA) link_directories(${OPENCOLLADA_LIBPATH}) - link_directories(${PCRE_LIBPATH}) - link_directories(${EXPAT_LIBPATH}) + ## Never set + # link_directories(${PCRE_LIBPATH}) + # link_directories(${EXPAT_LIBPATH}) endif() if(WITH_LLVM) link_directories(${LLVM_LIBPATH}) endif() - if(WITH_MEM_JEMALLOC) - link_directories(${JEMALLOC_LIBPATH}) - endif() if(WIN32 AND NOT UNIX) link_directories(${PTHREADS_LIBPATH}) |