Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:35:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:35:54 +0300
commit3076d95ba441cd32706a27d18922a30f8fd28b8a (patch)
tree1c4f33b41c3d6d94a738e598c95423cdcfa8a34d /build_files/cmake/packaging.cmake
parent91a9cd0a94000047248598394c41ac30f893f147 (diff)
Cleanup: use 2 space indentation for CMake
Diffstat (limited to 'build_files/cmake/packaging.cmake')
-rw-r--r--build_files/cmake/packaging.cmake122
1 files changed, 61 insertions, 61 deletions
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index c086e8778c5..06a97fc9abb 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -23,15 +23,15 @@ SET(CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}")
# Get the build revision, note that this can get out-of-sync, so for packaging run cmake first.
set(MY_WC_HASH "unknown")
if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
- find_package(Git)
- if(GIT_FOUND)
- # message(STATUS "Found Git: ${GIT_EXECUTABLE}")
- execute_process(COMMAND git rev-parse --short=12 HEAD
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE MY_WC_HASH
- OUTPUT_STRIP_TRAILING_WHITESPACE
- ERROR_QUIET)
- endif()
+ find_package(Git)
+ if(GIT_FOUND)
+ # message(STATUS "Found Git: ${GIT_EXECUTABLE}")
+ execute_process(COMMAND git rev-parse --short=12 HEAD
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ OUTPUT_VARIABLE MY_WC_HASH
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ ERROR_QUIET)
+ endif()
endif()
set(BUILD_REV ${MY_WC_HASH})
unset(MY_WC_HASH)
@@ -41,61 +41,61 @@ unset(MY_WC_HASH)
execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE CPACK_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
if(MSVC)
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(PACKAGE_ARCH windows64)
- else()
- set(PACKAGE_ARCH windows32)
- endif()
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ set(PACKAGE_ARCH windows64)
+ else()
+ set(PACKAGE_ARCH windows32)
+ endif()
else(MSVC)
- set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR})
+ set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR})
endif()
if(CPACK_OVERRIDE_PACKAGENAME)
- set(CPACK_PACKAGE_FILE_NAME ${CPACK_OVERRIDE_PACKAGENAME}-${PACKAGE_ARCH})
+ set(CPACK_PACKAGE_FILE_NAME ${CPACK_OVERRIDE_PACKAGENAME}-${PACKAGE_ARCH})
else()
- set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})
+ set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- # RPM packages
- include(build_files/cmake/RpmBuild.cmake)
- if(RPMBUILD_FOUND)
- set(CPACK_GENERATOR "RPM")
- set(CPACK_RPM_PACKAGE_RELEASE "git${CPACK_DATE}.${BUILD_REV}")
- set(CPACK_SET_DESTDIR "true")
- set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
- set(CPACK_PACKAGE_RELOCATABLE "false")
- set(CPACK_RPM_PACKAGE_LICENSE "GPLv2+ and Apache 2.0")
- set(CPACK_RPM_PACKAGE_GROUP "Amusements/Multimedia")
- set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_SOURCE_DIR}/build_files/package_spec/rpm/blender.spec.in")
- endif()
+ # RPM packages
+ include(build_files/cmake/RpmBuild.cmake)
+ if(RPMBUILD_FOUND)
+ set(CPACK_GENERATOR "RPM")
+ set(CPACK_RPM_PACKAGE_RELEASE "git${CPACK_DATE}.${BUILD_REV}")
+ set(CPACK_SET_DESTDIR "true")
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
+ set(CPACK_PACKAGE_RELOCATABLE "false")
+ set(CPACK_RPM_PACKAGE_LICENSE "GPLv2+ and Apache 2.0")
+ set(CPACK_RPM_PACKAGE_GROUP "Amusements/Multimedia")
+ set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_SOURCE_DIR}/build_files/package_spec/rpm/blender.spec.in")
+ endif()
endif()
# Mac Bundle
if(APPLE)
- set(CPACK_GENERATOR "DragNDrop")
+ set(CPACK_GENERATOR "DragNDrop")
- # Libraries are bundled directly
- set(CPACK_COMPONENT_LIBRARIES_HIDDEN TRUE)
+ # Libraries are bundled directly
+ set(CPACK_COMPONENT_LIBRARIES_HIDDEN TRUE)
endif()
if(WIN32)
- set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender")
- set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender")
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender")
+ set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender")
- set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
- set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
+ set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
+ set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
- set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt)
- set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
- set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
+ set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt)
+ set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
+ set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
- set(CPACK_WIX_TEMPLATE ${LIBDIR}/package/installer_wix/WIX.template)
- set(CPACK_WIX_UI_BANNER ${LIBDIR}/package/installer_wix/WIX_UI_BANNER.bmp)
- set(CPACK_WIX_UI_DIALOG ${LIBDIR}/package/installer_wix/WIX_UI_DIALOG.bmp)
+ set(CPACK_WIX_TEMPLATE ${LIBDIR}/package/installer_wix/WIX.template)
+ set(CPACK_WIX_UI_BANNER ${LIBDIR}/package/installer_wix/WIX_UI_BANNER.bmp)
+ set(CPACK_WIX_UI_DIALOG ${LIBDIR}/package/installer_wix/WIX_UI_DIALOG.bmp)
- #force lzma instead of deflate
- set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:high)
+ #force lzma instead of deflate
+ set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:high)
endif()
set(CPACK_PACKAGE_EXECUTABLES "blender" "blender")
@@ -106,30 +106,30 @@ include(CPack)
# Target for build_archive.py script, to automatically pass along
# version, revision, platform, build directory
macro(add_package_archive packagename extension)
- set(build_archive python ${CMAKE_SOURCE_DIR}/build_files/package_spec/build_archive.py)
- set(package_output ${CMAKE_BINARY_DIR}/release/${packagename}.${extension})
+ set(build_archive python ${CMAKE_SOURCE_DIR}/build_files/package_spec/build_archive.py)
+ set(package_output ${CMAKE_BINARY_DIR}/release/${packagename}.${extension})
- add_custom_target(package_archive DEPENDS ${package_output})
+ add_custom_target(package_archive DEPENDS ${package_output})
- add_custom_command(
- OUTPUT ${package_output}
- COMMAND ${build_archive} ${packagename} ${extension} bin release
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- unset(build_archive)
- unset(package_output)
+ add_custom_command(
+ OUTPUT ${package_output}
+ COMMAND ${build_archive} ${packagename} ${extension} bin release
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ unset(build_archive)
+ unset(package_output)
endmacro()
if(APPLE)
- add_package_archive(
- "${PROJECT_NAME}-${BLENDER_VERSION}-${BUILD_REV}-OSX-${CMAKE_OSX_ARCHITECTURES}"
- "zip")
+ add_package_archive(
+ "${PROJECT_NAME}-${BLENDER_VERSION}-${BUILD_REV}-OSX-${CMAKE_OSX_ARCHITECTURES}"
+ "zip")
elseif(UNIX)
- # platform name could be tweaked, to include glibc, and ensure processor is correct (i386 vs i686)
- string(TOLOWER ${CMAKE_SYSTEM_NAME} PACKAGE_SYSTEM_NAME)
+ # platform name could be tweaked, to include glibc, and ensure processor is correct (i386 vs i686)
+ string(TOLOWER ${CMAKE_SYSTEM_NAME} PACKAGE_SYSTEM_NAME)
- add_package_archive(
- "${PROJECT_NAME}-${BLENDER_VERSION}-${BUILD_REV}-${PACKAGE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}"
- "tar.bz2")
+ add_package_archive(
+ "${PROJECT_NAME}-${BLENDER_VERSION}-${BUILD_REV}-${PACKAGE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}"
+ "tar.bz2")
endif()
unset(MAJOR_VERSION)