diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-14 21:16:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-14 21:16:16 +0400 |
| commit | eef09b9cba900c15d9908615539728e028d77d03 (patch) | |
| tree | 61c533ce9b807ffa62c021b4cf1a7ab40b029ff7 /CMake | |
| parent | 47a41ad055f40a140b862499ca3955081e860a76 (diff) | |
cmake changes
- set python to 3.1 on linux (dont use FindPackage for now)
- remove duplicate settings (disable cache for copied settings, was quite confusing)
- added an option WITH_INSTALL, when disabled scripts and language files wont be copied to the target dir (better for quick builds)
- remove .svn (was still CVS), and pyc/pyc files after copy
- copy the 'io' as well as 'ui'
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/macros.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 3f706e5ed95..ff57cf6e34b 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -42,11 +42,15 @@ MACRO(SETUP_LIBDIRS) 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}) + LINK_DIRECTORIES(${PYTHON_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH}) LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH}) IF(WITH_INTERNATIONAL) + LINK_DIRECTORIES(${ICONV_LIBPATH}) LINK_DIRECTORIES(${GETTEXT_LIBPATH}) ENDIF(WITH_INTERNATIONAL) + IF(WITH_SDL) + LINK_DIRECTORIES(${SDL_LIBPATH}) + ENDIF(WITH_SDL) IF(WITH_OPENAL) LINK_DIRECTORIES(${OPENAL_LIBPATH}) ENDIF(WITH_OPENAL) |