Update to the translation code. Patch provided by dripstone.
[blender-staging.git] / CMakeLists.txt
index a0165ba4d383df1eb73282f6987dd5e471a9bf51..7f513b8028f420a5d4cb7c7ee1ed2ed2212f70da 100644 (file)
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 
+#-----------------------------------------------------------------------------
+# We don't allow in-source builds. This causes no end of troubles because 
+# all out-of-source builds will use the CMakeCache.txt file there and even 
+# build the libs and objects in it. It will also conflict with the current 
+# Makefile system for Blender
+
+IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
+Remove the CMakeCache.txt file and try again from another folder, e.g.: 
+
+   rm CMakeCache.txt 
+   cd ..
+   mkdir cmake-make 
+   cd cmake-make
+   cmake -G \"Unix Makefiles\" ../blender
+")
+ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 PROJECT(Blender)
 
@@ -47,6 +65,8 @@ OPTION(WITH_ELBEEM            "Enable Elbeem (Fluid Simulation)"                      ON)
 OPTION(WITH_QUICKTIME          "Enable Quicktime Support"                              OFF)
 OPTION(WITH_OPENEXR            "Enable OpenEXR Support (http://www.openexr.com)"       OFF)
 OPTION(WITH_FFMPEG             "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"   OFF)
+OPTION(WITH_OPENAL             "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(YESIAMSTUPID            "Enable execution on 64-bit platforms"                                  OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -124,6 +144,7 @@ IF(UNIX)
     /opt/local/include/freetype2
     /opt/csw/include/freetype2
     /opt/include/freetype2
+    NO_DEFAULT_PATH
   )
   SET(FREETYPE_LIB freetype)
 
@@ -176,13 +197,13 @@ IF(WIN32)
   SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
 
   SET(PYTHON ${LIBDIR}/python)
-  SET(PYTHON_VERSION 2.4)
+  SET(PYTHON_VERSION 2.5)
   SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
   SET(PYTHON_BINARY python)
-  SET(PYTHON_LIB python24)
+  SET(PYTHON_LIB python25)
   SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
-  SET(WITH_OPENAL ON)
+  #SET(WITH_OPENAL ON)
   SET(OPENAL ${LIBDIR}/openal)
   SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
   SET(OPENAL_LIB openal_static)
@@ -218,7 +239,7 @@ IF(WIN32)
   
   SET(OPENEXR ${LIBDIR}/openexr)
   SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
-  SET(OPENEXR_LIB Iex Half IlmImf Imath)
+  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
   SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
   
   SET(QUICKTIME ${LIBDIR}/QTDevWin)
@@ -231,7 +252,10 @@ IF(WIN32)
   SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
-  SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid odbc32 odbccp32 ws2_32 vfw32 winmm dxguid)
+  SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+  IF(WITH_OPENAL)
+    SET(LLIBS ${LLIBS} dxguid)
+  ENDIF(WITH_OPENAL)
 
   SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
   SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -306,7 +330,7 @@ IF(APPLE)
   SET(FREETYPE_LIB freetype)
 
   SET(OPENEXR ${LIBDIR}/openexr)
-  SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR)
+  SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
   IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
     SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
   ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
@@ -361,7 +385,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ")
 
 #-----------------------------------------------------------------------------
 # Libraries
-FILE(WRITE ${CMAKE_SOURCE_DIR}/cmake_blender_libs.txt "")
+FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
 SUBDIRS(
   intern
   extern