[Bf-blender-cvs] [e7dbab0] soc-2014-fluid: unused file deleted
Roman Pogribnyi
noreply at git.blender.org
Fri Aug 1 19:36:56 CEST 2014
Commit: e7dbab06f4a5128a36b133a1c0f4fb6517787189
Author: Roman Pogribnyi
Date: Fri Aug 1 19:36:27 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rBe7dbab06f4a5128a36b133a1c0f4fb6517787189
unused file deleted
===================================================================
D source/creator/CMakeLists (Autosaved).txt
===================================================================
diff --git a/source/creator/CMakeLists (Autosaved).txt b/source/creator/CMakeLists (Autosaved).txt
deleted file mode 100644
index 7d434c4..0000000
--- a/source/creator/CMakeLists (Autosaved).txt
+++ /dev/null
@@ -1,1168 +0,0 @@
-# ***** 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 *****
-
-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(WIN32)
- blender_include_dirs(../../intern/utfconv)
-endif()
-
-if(WITH_LIBMV)
- blender_include_dirs(../../extern/libmv)
- add_definitions(-DWITH_LIBMV)
-endif()
-
-if(WITH_CODEC_FFMPEG)
- add_definitions(-DWITH_FFMPEG)
-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(WITH_SDL)
- add_definitions(-DWITH_SDL)
-endif()
-
-if(WITH_BINRELOC)
- add_definitions(-DWITH_BINRELOC)
- blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
-endif()
-
-if(WITH_FREESTYLE)
- add_definitions(-DWITH_FREESTYLE)
- blender_include_dirs(../blender/freestyle)
-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)
- add_definitions(-DWITH_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_COMMIT_TIMESTAMP="${BUILD_COMMIT_TIMESTAMP}"
- # -DBUILD_COMMIT_TIME="${BUILD_COMMIT_TIME}"
- # -DBUILD_COMMIT_DATE="${BUILD_COMMIT_DATE}"
- # -DBUILD_HASH="${BUILD_HASH}"
- # -DBUILD_BRANCH="${BUILD_BRANCH}"
- -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.
- #
- # note that 'SHARED' works on Linux and Windows,
- # but not OSX which _must_ be 'MODULE'
- add_library(blender MODULE ${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(APPLE)
- set_target_properties(
- blender
- PROPERTIES
- LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}"
- LINK_FLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG}"
- )
- endif()
-
- 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()
-
-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
- ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt
-)
-
-if(WITH_INTERNATIONAL)
- list(APPEND BLENDER_TEXT_FILES
- ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt
- ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
- )
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Platform Specific Var: TARGETDIR_VER
-
-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()
-
-elseif(WIN32)
- set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-
-elseif(APPLE)
- if(WITH_PYTHON_MODULE)
- set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
- else()
- set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION})
- endif()
-
-endif()
-
-
-# -----------------------------------------------------------------------------
-# Install Targets (Generic, All Platforms)
-
-
-# important to make a clean install each time, else old scripts get loaded.
-install(
- CODE
- "file(REMOVE_RECURSE ${TARGETDIR_VER})"
-)
-
-if(WITH_PYTHON)
- # install(CODE "message(\"copying blender scripts...\")")
-
- # exclude addons_contrib if release
- if("${BLENDER_VERSION_CYCLE}" STREQUAL "release")
- set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*")
- else()
- set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*") # dummy, wont do anything
- endif()
-
- # do not install freestyle dir if disabled
- if(NOT WITH_FREESTYLE)
- set(FREESTYLE_EXCLUDE_CONDITIONAL "freestyle/*")
- else()
- set(FREESTYLE_EXCLUDE_CONDITIONAL "_freestyle/*") # dummy, wont do anything
- endif()
-
- install(
- DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
- DESTINATION ${TARGETDIR_VER}
- PATTERN ".git" EXCLUDE
- PATTERN "__pycache__" EXCLUDE
- PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
- PATTERN "${FREESTYLE_EXCLUDE_CONDITIONAL}" EXCLUDE
- )
-
- unset(ADDON_EXCLUDE_CONDITIONAL)
- unset(FREESTYLE_EXCLUDE_CONDITIONAL)
-endif()
-
-# localization
-if(WITH_INTERNATIONAL)
- install(
- DIRECTORY
- ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
- DESTINATION ${TARGETDIR_VER}/datafiles
- )
-
- set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
- set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale)
-
- file(GLOB _po_files "${_locale_dir}/po/*.po")
- foreach(_po_file ${_po_files})
- msgfmt_simple(${_po_file} _all_mo_files)
- endforeach()
-
- # Create a custom target which will compile all po to mo
- add_custom_target(
- locales
- DEPENDS ${_all_mo_files})
-
- add_dependencies(blender locales)
-
- # Generate INSTALL rules
- install(
- FILES ${_locale_dir}/languages
- DESTINATION ${_locale_target_dir}
- )
-
- foreach(_mo_file ${_all_mo_files})
- get_filename_component(_locale_name ${_mo_file} NAME_WE)
- install(
- FILES ${_mo_file}
- DESTINATION ${_locale_target_dir}/${_locale_name}/LC_MESSAGES
- RENAME blender.mo
- )
- unset(_locale_name)
- endforeach()
-
- unset(_all_mo_files)
- unset(_po_files)
- unset(_po_file)
- unset(_mo_file)
- unset(_locale_target_dir)
-
- unset(_locale_dir)
-endif()
-
-# color management
-if(WITH_OPENCOLORIO)
- install(
- DIRECTORY
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list