[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23026] branches/blender2.5/blender: white space commit.

Campbell Barton ideasman42 at gmail.com
Sun Sep 6 03:51:28 CEST 2009


Revision: 23026
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23026
Author:   campbellbarton
Date:     2009-09-06 03:51:23 +0200 (Sun, 06 Sep 2009)

Log Message:
-----------
white space commit. (2 spaces -> tab).
Was annoying to use a different editor for cmake only.
theeth says this should be ok with gsoc and merges from branches.

Modified Paths:
--------------
    branches/blender2.5/blender/CMakeLists.txt
    branches/blender2.5/blender/extern/CMakeLists.txt
    branches/blender2.5/blender/extern/bullet2/CMakeLists.txt
    branches/blender2.5/blender/extern/bullet2/src/BulletCollision/CMakeLists.txt
    branches/blender2.5/blender/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
    branches/blender2.5/blender/extern/glew/CMakeLists.txt
    branches/blender2.5/blender/intern/CMakeLists.txt
    branches/blender2.5/blender/intern/audaspace/CMakeLists.txt
    branches/blender2.5/blender/intern/elbeem/CMakeLists.txt
    branches/blender2.5/blender/intern/ghost/CMakeLists.txt
    branches/blender2.5/blender/intern/guardedalloc/CMakeLists.txt
    branches/blender2.5/blender/intern/smoke/CMakeLists.txt
    branches/blender2.5/blender/source/CMakeLists.txt
    branches/blender2.5/blender/source/blender/CMakeLists.txt
    branches/blender2.5/blender/source/blender/avi/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenlib/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenloader/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenpluginapi/CMakeLists.txt
    branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
    branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
    branches/blender2.5/blender/source/blender/gpu/CMakeLists.txt
    branches/blender2.5/blender/source/blender/imbuf/CMakeLists.txt
    branches/blender2.5/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/blender2.5/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/blender2.5/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/blender2.5/blender/source/blender/makesdna/intern/CMakeLists.txt
    branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
    branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
    branches/blender2.5/blender/source/blender/python/CMakeLists.txt
    branches/blender2.5/blender/source/blender/quicktime/CMakeLists.txt
    branches/blender2.5/blender/source/blender/readblenfile/CMakeLists.txt
    branches/blender2.5/blender/source/blender/render/CMakeLists.txt
    branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
    branches/blender2.5/blender/source/blenderplayer/CMakeLists.txt
    branches/blender2.5/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/blender2.5/blender/source/creator/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Expressions/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/GameLogic/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/GamePlayer/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Network/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Physics/common/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Rasterizer/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/SceneGraph/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/VideoTexture/CMakeLists.txt
    branches/blender2.5/blender/source/kernel/CMakeLists.txt

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2009-09-06 01:11:47 UTC (rev 23025)
+++ branches/blender2.5/blender/CMakeLists.txt	2009-09-06 01:51:23 UTC (rev 23026)
@@ -34,11 +34,11 @@
 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
+	rm CMakeCache.txt 
+	cd ..
+	mkdir cmake-make 
+	cd cmake-make
+	cmake -G \"Unix Makefiles\" ../blender
 ")
 ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 
@@ -76,7 +76,7 @@
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
-  MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
+	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
@@ -95,421 +95,421 @@
 #Platform specifics
 
 IF(UNIX AND NOT APPLE)
-  IF(WITH_OPENAL)
-    FIND_PACKAGE(OpenAL)
-    IF(OPENAL_FOUND)
-      SET(WITH_OPENAL ON)
-    ELSE(OPENAL_FOUND)
-      SET(WITH_OPENAL OFF)
-    ENDIF(OPENAL_FOUND)
-  ENDIF(WITH_OPENAL)
+	IF(WITH_OPENAL)
+		FIND_PACKAGE(OpenAL)
+		IF(OPENAL_FOUND)
+			SET(WITH_OPENAL ON)
+		ELSE(OPENAL_FOUND)
+			SET(WITH_OPENAL OFF)
+		ENDIF(OPENAL_FOUND)
+	ENDIF(WITH_OPENAL)
 
-  IF(WITH_JACK)
-    SET(JACK /usr)
-    SET(JACK_INC ${JACK}/include/jack)
-    SET(JACK_LIB jack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
+	IF(WITH_JACK)
+		SET(JACK /usr)
+		SET(JACK_INC ${JACK}/include/jack)
+		SET(JACK_LIB jack)
+		SET(JACK_LIBPATH ${JACK}/lib)
+	ENDIF(WITH_JACK)
 
-  IF(WITH_SNDFILE)
+	IF(WITH_SNDFILE)
 	SET(SNDFILE /usr)
 	SET(SNDFILE_INC ${SNDFILE}/include)
 	SET(SNDFILE_LIB sndfile)
 	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-  ENDIF(WITH_SNDFILE)
+	ENDIF(WITH_SNDFILE)
 
-  FIND_LIBRARY(INTL_LIBRARY
-    NAMES intl
-    PATHS
-    /sw/lib
-  )
-  FIND_LIBRARY(ICONV_LIBRARY
-    NAMES iconv
-    PATHS
-    /sw/lib
-  )
+	FIND_LIBRARY(INTL_LIBRARY
+		NAMES intl
+		PATHS
+		/sw/lib
+	)
+	FIND_LIBRARY(ICONV_LIBRARY
+		NAMES iconv
+		PATHS
+		/sw/lib
+	)
   
-  IF(INTL_LIBRARY AND ICONV_LIBRARY)
-    SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
-  ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+	IF(INTL_LIBRARY AND ICONV_LIBRARY)
+		SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+	ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
 
-  FIND_PACKAGE(Freetype)
-  # UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
+	FIND_PACKAGE(Freetype)
+	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
 
-  # No way to set py31. remove for now.
-  # FIND_PACKAGE(PythonLibs)
-  SET(PYTHON /usr)
-  SET(PYTHON_VERSION 3.1)
-  SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-  # SET(PYTHON_BINARY python) # not used yet
-  SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
-  SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+	# No way to set py31. remove for now.
+	# FIND_PACKAGE(PythonLibs)
+	SET(PYTHON /usr)
+	SET(PYTHON_VERSION 3.1)
+	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+	# SET(PYTHON_BINARY python) # not used yet
+	SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+	SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
   
-  # FIND_PACKAGE(PythonInterp) # not used yet
-  # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+	# FIND_PACKAGE(PythonInterp) # not used yet
+	# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
   
-  SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+	SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
-  IF(WITH_SDL)
-    FIND_PACKAGE(SDL)
-    # UNSET(SDLMAIN_LIBRARY CACHE)
-    IF(NOT SDL_FOUND)
-      SET(WITH_SDL OFF)
-    ENDIF(NOT SDL_FOUND)
-  ENDIF(WITH_SDL)
+	IF(WITH_SDL)
+		FIND_PACKAGE(SDL)
+		# UNSET(SDLMAIN_LIBRARY CACHE)
+		IF(NOT SDL_FOUND)
+			SET(WITH_SDL OFF)
+		ENDIF(NOT SDL_FOUND)
+	ENDIF(WITH_SDL)
 
-  FIND_PATH(OPENEXR_INC
-    ImfXdr.h
-    PATHS
-    /usr/local/include/OpenEXR
-    /usr/include/OpenEXR
-    /sw/include/OpenEXR
-    /opt/local/include/OpenEXR
-    /opt/csw/include/OpenEXR
-    /opt/include/OpenEXR
-  )
-  SET(OPENEXR_LIB Half IlmImf Iex Imath)
+	FIND_PATH(OPENEXR_INC
+		ImfXdr.h
+		PATHS
+		/usr/local/include/OpenEXR
+		/usr/include/OpenEXR
+		/sw/include/OpenEXR
+		/opt/local/include/OpenEXR
+		/opt/csw/include/OpenEXR
+		/opt/include/OpenEXR
+	)
+	SET(OPENEXR_LIB Half IlmImf Iex Imath)
 
-  SET(FFMPEG /usr)
-  SET(FFMPEG_INC ${FFMPEG}/include)
-  SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	SET(FFMPEG /usr)
+	SET(FFMPEG_INC ${FFMPEG}/include)
+	SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
+	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
   
-  IF(WITH_FFTW3)
-    SET(FFTW3 /usr)
-    SET(FFTW3_INC ${FFTW3}/include)
-    SET(FFTW3_LIB fftw3)
-    SET(FFTW3_LIBPATH ${FFTW3}/lib)
-  ENDIF(WITH_FFTW3)
+	IF(WITH_FFTW3)
+		SET(FFTW3 /usr)
+		SET(FFTW3_INC ${FFTW3}/include)
+		SET(FFTW3_LIB fftw3)
+		SET(FFTW3_LIBPATH ${FFTW3}/lib)
+	ENDIF(WITH_FFTW3)
 
-  SET(LIBSAMPLERATE /usr)
-  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-  SET(LIBSAMPLERATE_LIB samplerate)
-  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+	SET(LIBSAMPLERATE /usr)
+	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+	SET(LIBSAMPLERATE_LIB samplerate)
+	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-  FIND_PACKAGE(JPEG REQUIRED)
+	FIND_PACKAGE(JPEG REQUIRED)
 
-  FIND_PACKAGE(PNG REQUIRED)
+	FIND_PACKAGE(PNG REQUIRED)
 
-  FIND_PACKAGE(ZLIB REQUIRED)
+	FIND_PACKAGE(ZLIB REQUIRED)
 
-  # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
-  SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+	# Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
+	SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
 
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    # BSD's dont use libdl.so
-    SET(LLIBS "${LLIBS} -ldl")
-  ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+		# BSD's dont use libdl.so
+		SET(LLIBS "${LLIBS} -ldl")
+	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
-  IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
-  ENDIF(WITH_OPENMP)
+	IF(WITH_OPENMP)
+		SET(LLIBS "${LLIBS} -lgomp")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+	ENDIF(WITH_OPENMP)
 
 
-  SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
+	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
 
-  SET(PLATFORM_LINKFLAGS "-pthread")
+	SET(PLATFORM_LINKFLAGS "-pthread")
 
-  # Better warnings
-  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
-  SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+	# Better warnings
+	SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
+	SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
-  INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+	INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 ENDIF(UNIX AND NOT APPLE)
 
 IF(WIN32)
 
-  # this file is included anyway when building under Windows with cl.exe
-  #  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
+	# this file is included anyway when building under Windows with cl.exe
+	#  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
   
-  SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+	SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
 
-  # Setup 64bit and 64bit windows systems
-  IF(CMAKE_CL_64)
-    message("64 bit compiler detected.")
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
-  ENDIF(CMAKE_CL_64)
+	# Setup 64bit and 64bit windows systems
+	IF(CMAKE_CL_64)
+		message("64 bit compiler detected.")
+		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+	ENDIF(CMAKE_CL_64)
 
-  SET(PYTHON ${LIBDIR}/python)
-  SET(PYTHON_VERSION 3.1)
-  SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
-  # SET(PYTHON_BINARY python) # not used yet
-  SET(PYTHON_LIB python31)
-  SET(PYTHON_LIBPATH ${PYTHON}/lib)
+	SET(PYTHON ${LIBDIR}/python)
+	SET(PYTHON_VERSION 3.1)
+	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+	# SET(PYTHON_BINARY python) # not used yet
+	SET(PYTHON_LIB python31)
+	SET(PYTHON_LIBPATH ${PYTHON}/lib)
 
-  IF(CMAKE_CL_64)
-    SET(WITH_OPENAL OFF)
-  ELSE(CMAKE_CL_64)
-    #SET(WITH_OPENAL ON)
-    SET(OPENAL ${LIBDIR}/openal)
-    SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-    SET(OPENAL_LIBRARY wrap_oal)
-    SET(OPENAL_LIBPATH ${OPENAL}/lib)
-  ENDIF(CMAKE_CL_64)
+	IF(CMAKE_CL_64)
+		SET(WITH_OPENAL OFF)
+	ELSE(CMAKE_CL_64)
+		#SET(WITH_OPENAL ON)
+		SET(OPENAL ${LIBDIR}/openal)
+		SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+		SET(OPENAL_LIBRARY wrap_oal)
+		SET(OPENAL_LIBPATH ${OPENAL}/lib)
+	ENDIF(CMAKE_CL_64)
 
-  IF(WITH_JACK)
-    SET(JACK ${LIBDIR}/jack)
-    SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
-    SET(JACK_LIB libjack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
+	IF(WITH_JACK)
+		SET(JACK ${LIBDIR}/jack)
+		SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
+		SET(JACK_LIB libjack)
+		SET(JACK_LIBPATH ${JACK}/lib)
+	ENDIF(WITH_JACK)
 
-  IF(WITH_SNDFILE)
-	SET(SNDFILE ${LIBDIR}/sndfile)
-	SET(SNDFILE_INC ${SNDFILE}/include)
-	SET(SNDFILE_LIB libsndfile-1)
-	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-  ENDIF(WITH_SNDFILE)
+	IF(WITH_SNDFILE)
+		SET(SNDFILE ${LIBDIR}/sndfile)
+		SET(SNDFILE_INC ${SNDFILE}/include)
+		SET(SNDFILE_LIB libsndfile-1)
+		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+	ENDIF(WITH_SNDFILE)
 
-  IF(CMAKE_CL_64)
-    SET(PNG_LIBRARIES libpng)
-  ELSE(CMAKE_CL_64)
-    SET(PNG_LIBRARIES libpng_st)
-  ENDIF(CMAKE_CL_64)
-  SET(JPEG_LIBRARY libjpeg)
+	IF(CMAKE_CL_64)
+		SET(PNG_LIBRARIES libpng)
+	ELSE(CMAKE_CL_64)
+		SET(PNG_LIBRARIES libpng_st)
+	ENDIF(CMAKE_CL_64)
+	SET(JPEG_LIBRARY libjpeg)
 
-  SET(ZLIB ${LIBDIR}/zlib)
-  SET(ZLIB_INC ${ZLIB}/include)
-  IF(CMAKE_CL_64)
-    SET(ZLIB_LIBRARIES libz)
-  ELSE(CMAKE_CL_64)
-    SET(ZLIB_LIBRARIES zlib)
-  ENDIF(CMAKE_CL_64)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list