diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 18:15:36 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 18:15:36 +0400 |
| commit | 656ee61718d85f9366115756ba28e4b53f36d6b2 (patch) | |
| tree | cca1c89160ea2facf62675bfd9313a0c6a052d30 /CMake | |
| parent | 2f9f0710d140466f3b8030b66f4637b7f12b9d4a (diff) | |
Merge from trunk
(The last time there was some files missing due to failed connection to svn server while merging.. thats why this stuff of reverting last merge and redoing it)
svn merge -r 16231:16608 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/macros.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 6b6837d25f0..95799a2c1fd 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -38,6 +38,10 @@ MACRO(BLENDERLIB ENDMACRO(BLENDERLIB) MACRO(SETUP_LIBDIRS) + # see "cmake --help-policy CMP0003" + if(COMMAND cmake_policy) + CMAKE_POLICY(SET CMP0003 NEW) + endif(COMMAND cmake_policy) LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH}) IF(WITH_INTERNATIONAL) LINK_DIRECTORIES(${GETTEXT_LIBPATH}) |