diff options
| author | Germano <germano.costa@ig.com.br> | 2017-10-29 23:20:24 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2017-10-29 23:20:24 +0300 |
| commit | bed3cbdf3d88a61cf081941c0fd96205f47ecee7 (patch) | |
| tree | a525a64586ab602101e08134bcd5ba3dcb98a7c1 /build_files/cmake/macros.cmake | |
| parent | 34859b285aff14b022c9b175fa2babfff7c63314 (diff) | |
| parent | 475ec5269ae8f7c30795c2e771100e087b5dd315 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# build_files/cmake/macros.cmake
# build_files/cmake/platform/platform_win32.cmake
Diffstat (limited to 'build_files/cmake/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 114 |
1 files changed, 58 insertions, 56 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 62caf31dfd6..afe5a2cdc72 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -282,65 +282,67 @@ 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 (NOT MSVC) + 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_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_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_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_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_CODEC_SNDFILE) + link_directories(${SNDFILE_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}) - link_directories(${HDF5_LIBPATH}) - endif() + if(WITH_ALEMBIC) + link_directories(${ALEMBIC_LIBPATH}) + link_directories(${HDF5_LIBPATH}) + endif() - if(WIN32 AND NOT UNIX) - link_directories(${PTHREADS_LIBPATH}) - endif() + if(WIN32 AND NOT UNIX) + link_directories(${PTHREADS_LIBPATH}) + endif() + endif(NOT MSVC) endfunction() function(setup_liblinks |