diff --git a/.travis.yml b/.travis.yml
index 70e6037..a736f8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ deploy:
api_key:
secure: dDlkIawHcODlW9B/20/cQCtzeoocvs0hKuNngRKXKqzXLWTRq33oq/B7+39tAixWbmv6exTpijiKrRNFiSCW5Z4iwHLwaRD4XJznxw63e/Hus/dxg2Tvqx7XFpkCz8mT1Z+gZQE5YxAngeZPpI/sZbZtF1UO3yH5eLeeokZ15p26ZskQUPoYuzrTgTzYL3XfpG3F+20rNBawH1ycsCTVD/08/n31d2m3CrKAsbW7er92ek6w4fzKr7NW8WeXjrPJETVpw5fQg1Od3pRGW8dPQaJcvKQEogMp8Mm0ETYd0qigg89/giBz7QwOgmAWQ4dH+DfZH4Ojl//127QztBolMvyDMQBykWrtJoGcij05sT6K2IJr2FHeUBO12MAEdjiVvhQj3DtTzjPiZAHHDBSLWxLKWWhlhHE4pq7g1MQhqXkaAHI2BLNzwLmaowbMT0bECf9yfz6xx18h6XPQFX44oOktraobVALFlyHqeKa8zdcUt22LF6uAL1m5dxL0tny3eXCIPE4UH/RZgua/cHV9G3cUvKQa/QnFSLRhvWVSbGB+7YsHouBJcsUOOW1gmd5442XuC7mpppccRldh+GSxUk6TBJRAx7TeQ0ybDUaoco9MUqp2twv3KreR2+8Q12PDaAhfQVNEGdF3wTm1sShImjCN4VN3eSLlBEbve1QRQXM=
skip_cleanup: true
- file: build/solvespace.dmg
+ file: build/SolveSpace.dmg
on:
repo: solvespace/solvespace
tags: true
diff --git a/README.md b/README.md
index d2b266d..8402b55 100644
--- a/README.md
+++ b/README.md
@@ -129,9 +129,9 @@ Alternatively, generate an XCode project, open it, and build the "Release" schem
cd build
cmake .. -G Xcode
-The application is built in `build/bin/solvespace.app`, the graphical interface executable
-is `build/bin/solvespace.app/Contents/MacOS/solvespace`, and the command-line interface executable
-is `build/bin/solvespace.app/Contents/MacOS/solvespace-cli`.
+The application is built in `build/bin/SolveSpace.app`, the graphical interface executable
+is `build/bin/SolveSpace.app/Contents/MacOS/SolveSpace`, and the command-line interface executable
+is `build/bin/SolveSpace.app/Contents/MacOS/solvespace-cli`.
[homebrew]: https://brew.sh/
[appledeveloper]: https://developer.apple.com/download/
diff --git a/cmake/MacOSXBundleInfo.plist.in b/cmake/MacOSXBundleInfo.plist.in
index ba49a8a..668d1f7 100644
--- a/cmake/MacOSXBundleInfo.plist.in
+++ b/cmake/MacOSXBundleInfo.plist.in
@@ -7,7 +7,7 @@
CFBundleDevelopmentRegion
English
CFBundleExecutable
- solvespace
+ SolveSpace
CFBundleInfoDictionaryVersion
6.0
CFBundleName
diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 1a9e73d..4542a5a 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -31,7 +31,7 @@ if(WIN32)
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${source}")
endfunction()
elseif(APPLE)
- set(app_resource_dir ${CMAKE_BINARY_DIR}/bin/solvespace.app/Contents/Resources)
+ set(app_resource_dir ${CMAKE_BINARY_DIR}/bin/SolveSpace.app/Contents/Resources)
set(cli_resource_dir ${CMAKE_BINARY_DIR}/res)
function(add_resource name)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9a90cc0..ad25521 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -330,6 +330,9 @@ if(ENABLE_GUI)
if(MSVC)
set_target_properties(solvespace PROPERTIES
LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO /INCREMENTAL:NO /OPT:REF /STACK:33554432")
+ elseif(APPLE)
+ set_target_properties(solvespace PROPERTIES
+ OUTPUT_NAME SolveSpace)
endif()
endif()
@@ -388,7 +391,7 @@ endif()
# solvespace macOS package
if(APPLE)
- set(bundle solvespace)
+ set(bundle SolveSpace)
set(bundle_bin ${EXECUTABLE_OUTPUT_PATH}/${bundle}.app/Contents/MacOS)
add_custom_command(TARGET solvespace POST_BUILD
@@ -401,7 +404,7 @@ if(APPLE)
COMMAND ${CMAKE_COMMAND} -E remove ${EXECUTABLE_OUTPUT_PATH}/${bundle}.dmg
COMMAND hdiutil create -srcfolder ${EXECUTABLE_OUTPUT_PATH}/${bundle}.app
${EXECUTABLE_OUTPUT_PATH}/${bundle}.dmg
- DEPENDS $
+ DEPENDS solvespace
COMMENT "Building ${bundle}.dmg"
VERBATIM)
add_custom_target(${bundle}-dmg ALL