[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40228] branches/soc-2011-garlic/source/ creator/CMakeLists.txt.orig: Hrm, how this file appeared to be versioned?

Sergey Sharybin g.ulairi at gmail.com
Thu Sep 15 15:17:04 CEST 2011


Revision: 40228
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40228
Author:   nazgul
Date:     2011-09-15 13:17:04 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Hrm, how this file appeared to be versioned?

Removed Paths:
-------------
    branches/soc-2011-garlic/source/creator/CMakeLists.txt.orig

Deleted: branches/soc-2011-garlic/source/creator/CMakeLists.txt.orig
===================================================================
--- branches/soc-2011-garlic/source/creator/CMakeLists.txt.orig	2011-09-15 13:14:46 UTC (rev 40227)
+++ branches/soc-2011-garlic/source/creator/CMakeLists.txt.orig	2011-09-15 13:17:04 UTC (rev 40228)
@@ -1,891 +0,0 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
-# $Id: CMakeLists.txt 38823 2011-07-29 17:42:53Z xiaoxiangquan $
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# So BUILDINFO and BLENDERPATH strings are automatically quoted
-cmake_policy(SET CMP0005 NEW)
-
-setup_libdirs()
-
-blender_include_dirs(
-	../../intern/guardedalloc
-	../blender/blenlib
-	../blender/blenkernel
-	../blender/blenloader
-	../blender/editors/include
-	../blender/makesrna
-	../blender/imbuf
-	../blender/render/extern/include
-	../blender/makesdna
-	../blender/gpu
-	../blender/windowmanager
-)
-
-if(WITH_CODEC_QUICKTIME)
-	add_definitions(-DWITH_QUICKTIME)
-endif()
-
-if(WITH_IMAGE_OPENEXR)
-	add_definitions(-DWITH_OPENEXR)
-endif()
-
-if(WITH_IMAGE_OPENJPEG)
-	add_definitions(-DWITH_OPENJPEG)
-endif()
-
-if(WITH_IMAGE_TIFF)
-	add_definitions(-DWITH_TIFF)
-endif()
-
-if(WITH_IMAGE_DDS)
-	add_definitions(-DWITH_DDS)
-endif()
-
-if(WITH_IMAGE_CINEON)
-	add_definitions(-DWITH_CINEON)
-endif()
-
-if(WITH_IMAGE_HDR)
-	add_definitions(-DWITH_HDR)
-endif()
-
-if(WITH_PYTHON)
-	blender_include_dirs(../blender/python)
-	add_definitions(-DWITH_PYTHON)
-
-	if(WITH_PYTHON_SECURITY)
-		add_definitions(-DWITH_PYTHON_SECURITY)
-	endif()
-endif()
-
-if(WITH_HEADLESS)
-	add_definitions(-DWITH_HEADLESS)
-endif()
-
-if(WITH_GAMEENGINE)
-	blender_include_dirs(../gameengine/BlenderRoutines)
-
-	add_definitions(-DWITH_GAMEENGINE)
-endif()
-
-if(NOT WITH_SDL)
-	add_definitions(-DDISABLE_SDL)
-endif()
-
-if(WITH_BINRELOC)
-	add_definitions(-DWITH_BINRELOC)
-	blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
-endif()
-
-# Setup the exe sources and buildinfo
-set(SRC
-	creator.c
-)
-
-# MSVC 2010 gives linking errors with the manifest
-if(WIN32 AND NOT UNIX)
-	string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
-	string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
-	string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
-	if(MINGW)
-		add_definitions(
-			-DWINDRES
-			-DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
-			-DBLEN_VER_RC_1=${bver1}
-			-DBLEN_VER_RC_2=${bver2}
-			-DBLEN_VER_RC_3=${bver3}
-			-DBLEN_VER_RC_4=0
-		)
-	else()
-		add_definitions(
-			-DBLEN_VER_RC_STR=${BLENDER_VERSION}
-			-DBLEN_VER_RC_1=${bver1}
-			-DBLEN_VER_RC_2=${bver2}
-			-DBLEN_VER_RC_3=${bver3}
-			-DBLEN_VER_RC_4=0
-		)
-	endif()
-	
-
-	list(APPEND SRC
-		../icons/winblender.rc
-	)
-endif()
-
-if(WITH_BUILDINFO)
-	# --------------------------------------------------------------------------
-	# These defines could all be moved into the header below
-	string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
-	string(REPLACE " " "\ " BUILDINFO_CXXFLAGS "${CMAKE_CXX_FLAGS}")
-	string(REPLACE " " "\ " BUILDINFO_LINKFLAGS "${PLATFORM_LINKFLAGS}")
-	add_definitions(
-		# # define in header now, else these get out of date on rebuilds.
-		# -DBUILD_DATE="${BUILD_DATE}"
-		# -DBUILD_TIME="${BUILD_TIME}"
-		# -DBUILD_REV="${BUILD_REV}"
-		-DWITH_BUILDINFO_HEADER # alternative to lines above
-		-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
-		-DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		-DBUILD_CFLAGS="${BUILDINFO_CFLAGS}"
-		-DBUILD_CXXFLAGS="${BUILDINFO_CXXFLAGS}"
-		-DBUILD_LINKFLAGS="${BUILDINFO_LINKFLAGS}"
-		-DBUILD_SYSTEM="CMake"
-	)
-
-	# --------------------------------------------------------------------------
-	# write header for values that change each build
-	# note, generaed file is in build dir's source/creator
-	#       except when used as an include path.
-
-	# include the output directory, where the buildinfo.h file is generated
-	include_directories(${CMAKE_BINARY_DIR}/source/creator)
-
-	# a custom target that is always built
-	add_custom_target(buildinfo ALL
-		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h)
-
-	# creates svnheader.h using cmake script
-	add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
-		COMMAND ${CMAKE_COMMAND}
-		-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-		-P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake)
-
-	# buildinfo.h is a generated file
-	set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
-		PROPERTIES GENERATED TRUE
-		HEADER_FILE_ONLY TRUE)
-
-	# add deps below, after adding blender
-	# -------------- done with header values.
-
-	list(APPEND SRC
-		buildinfo.c
-	)
-endif()
-
-# message(STATUS "Configuring blender")
-if(WITH_PYTHON_MODULE)
-	add_definitions(-DWITH_PYTHON_MODULE)
-
-	# creates ./bin/bpy.so which can be imported as a python module.
-	add_library(blender SHARED ${SRC})
-	set_target_properties(
-		blender
-		PROPERTIES
-			PREFIX ""
-			OUTPUT_NAME bpy
-			LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-			RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # only needed on windows
-	)
-	
-	if(WIN32)
-		# python modules use this
-		set_target_properties(
-			blender
-			PROPERTIES
-			SUFFIX ".pyd"
-		)	
-	endif()
-	
-else()
-	add_executable(blender ${EXETYPE} ${SRC})
-endif()
-
-if(WITH_BUILDINFO)
-	# explicitly say that the executable depends on the buildinfo
-	add_dependencies(blender buildinfo)
-endif()
-
-# Post build steps for bundling/packaging.
-
-
-if(MSVC_IDE)
-	# ${CMAKE_CFG_INTDIR} should replace \${BUILD_TYPE} when using add_command
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-elseif(APPLE)
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
-else()
-	set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH})
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Install Targets
-
-set(BLENDER_TEXT_FILES
-	${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt
-	${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
-	${CMAKE_SOURCE_DIR}/release/text/copyright.txt
-	${CMAKE_SOURCE_DIR}/release/text/readme.html
-)
-
-if(UNIX AND NOT APPLE)
-
-	if(WITH_INSTALL_PORTABLE)
-		set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-	else()
-		if(WITH_PYTHON_MODULE)
-			set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
-		else()
-			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
-		endif()
-	endif()
-
-	# important to make a clean  install each time
-	# else old scripts get loaded.
-	install(
-		CODE
-		"file(REMOVE_RECURSE ${TARGETDIR_VER})"
-	)
-
-	# message after building.
-	add_custom_command(
-		TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-		COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${TARGETDIR_VER}'
-	)
-
-	# there are a few differences between portable and system install
-	if(WITH_INSTALL_PORTABLE)
-		install(
-			FILES
-				${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
-				${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-			DESTINATION ${TARGETDIR}
-		)
-
-		install(
-			PROGRAMS
-			${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
-			DESTINATION ${TARGETDIR}
-		)
-
-		install(
-			FILES ${BLENDER_TEXT_FILES}
-			DESTINATION ${TARGETDIR}
-		)
-
-	else()
-		# main blender binary
-		if(WITH_PYTHON_MODULE)
-			install(
-				TARGETS blender
-				LIBRARY
-				DESTINATION ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages
-			)
-		else()
-			install(
-				PROGRAMS ${TARGETDIR}/blender
-				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-			)
-		endif()
-
-
-		if(WITH_GAMEENGINE AND WITH_PLAYER)
-			install(
-				PROGRAMS ${TARGETDIR}/blenderplayer
-				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-			)
-		endif()
-
-		# misc files
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
-		)
-		install(
-			DIRECTORY
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
-				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
-			PATTERN ".svn" EXCLUDE
-			PATTERN "*.svg" EXCLUDE
-		)
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
-		)
-		install(
-			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-		)
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
-		)
-		install(
-			FILES ${BLENDER_TEXT_FILES}
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
-		)
-	endif()
-
-	install(
-		FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-		DESTINATION ${TARGETDIR_VER}
-	)
-
-	if(WITH_INTERNATIONAL)
-		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
-			DESTINATION ${TARGETDIR_VER}
-		)
-
-		install(
-			DIRECTORY
-				${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
-				${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
-			DESTINATION ${TARGETDIR_VER}/datafiles
-			PATTERN ".svn" EXCLUDE
-		)
-	endif()
-
-		# plugins in blender 2.5 don't work at the moment.
-		#
-		# install(
-		# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-		# 	DESTINATION ${TARGETDIR_VER}
-		# 	PATTERN ".svn" EXCLUDE
-		# )
-
-	if(WITH_PYTHON)
-		# install(CODE "message(\"copying blender scripts...\")")
-		install(

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list