From eef09b9cba900c15d9908615539728e028d77d03 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 14 Aug 2009 17:16:16 +0000 Subject: 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' --- CMake/macros.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CMake') 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) -- cgit v1.2.3