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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-21 19:12:00 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-22 00:37:40 +0300
commitc553b790fc781772e8fbfffb91e3bf062d3202d6 (patch)
treef3168bc8cd2c90a2a5dc9fb070e6065639c1460d /source/creator/CMakeLists.txt
parentad4f5092ecaf919e415fec4ca62b0172293a2075 (diff)
macOS: rename blender.app to Blender.app
Using a capitalized app name fits the platform guidelines. Since macOS file systems are case insensitive by default this should not break scripts that assume lowercase.
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt16
1 files changed, 9 insertions, 7 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 41412af9aea..abb3dd22673 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -340,7 +340,7 @@ elseif(APPLE)
if(WITH_PYTHON_MODULE)
set(TARGETDIR_VER ${BLENDER_VERSION})
else()
- set(TARGETDIR_VER blender.app/Contents/Resources/${BLENDER_VERSION})
+ set(TARGETDIR_VER Blender.app/Contents/Resources/${BLENDER_VERSION})
endif()
# Skip relinking on cpack / install
set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true)
@@ -868,6 +868,8 @@ elseif(WIN32)
)
endif()
elseif(APPLE)
+ # Uppercase name for app bundle
+ set_target_properties(blender PROPERTIES OUTPUT_NAME Blender)
# handy install macro to exclude files, we use \$ escape for the "to"
# argument when calling so ${BUILD_TYPE} does not get expanded
@@ -895,7 +897,7 @@ elseif(APPLE)
)
endmacro()
- set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blender.app)
+ set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/Blender.app)
# setup Info.plist
execute_process(COMMAND date "+%Y-%m-%d"
@@ -914,7 +916,7 @@ elseif(APPLE)
# Give the bundle actual creation/modification date
execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE}
- ${EXECUTABLE_OUTPUT_PATH}/blender.app)
+ ${EXECUTABLE_OUTPUT_PATH}/Blender.app)
install(
TARGETS blender
@@ -926,25 +928,25 @@ elseif(APPLE)
install(
FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
- DESTINATION blender.app/Contents
+ DESTINATION Blender.app/Contents
)
install_dir(
${OSX_APP_SOURCEDIR}/Contents/Resources
- blender.app/Contents/
+ Blender.app/Contents/
)
if(WITH_OPENMP AND OPENMP_CUSTOM)
install(
FILES ${LIBDIR}/openmp/lib/libomp.dylib
- DESTINATION blender.app/Contents/Resources/lib
+ DESTINATION Blender.app/Contents/Resources/lib
)
endif()
if(WITH_LLVM AND NOT LLVM_STATIC)
install(
FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib
- DESTINATION blender.app/Contents/MacOS
+ DESTINATION Blender.app/Contents/MacOS
)
endif()