diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 71d0dab326..0d06c9024d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -53,7 +53,7 @@ set(VX_RESOURCE_FILES data/core/core.qrc) qt_add_binary_resources(VX_EXTRA_RESOURCE data/extra/extra.qrc DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/vnote_extra.rcc OPTIONS -compress 9) -add_executable(vnote WIN32 MACOSX_BUNDLE +add_executable(vnote WIN32 application.cpp application.h commandlineoptions.cpp commandlineoptions.h fakeaccessible.cpp fakeaccessible.h @@ -122,19 +122,9 @@ if (WIN32) install(TARGETS vnote RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(FILES "${PROJECT_SOURCE_DIR}/package/qt.conf" DESTINATION ${CMAKE_INSTALL_BINDIR}) elseif(APPLE) - set(CMAKE_MACOSX_BUNDLE ON) + set(CMAKE_MACOSX_BUNDLE OFF) set(CMAKE_MACOSX_RPATH ON) install(TARGETS vnote BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - set_target_properties(vnote - PROPERTIES - MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}" - MACOSX_BUNDLE_INFO_STRING "${PROJECT_DESCRIPTION}" - MACOSX_BUNDLE_GUI_IDENTIFIER "fun.vnote.app" - MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}" - MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}" - MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}" - MACOSX_BUNDLE_COPYRIGHT "Distributed under LGPL-3.0 license. Copyright (c) 2024 app.vnote.fun" - ) else() install(TARGETS vnote LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/src/CPackMacDeployQt.cmake.in b/src/CPackMacDeployQt.cmake.in index 2c56af6ba0..dde001a2b3 100644 --- a/src/CPackMacDeployQt.cmake.in +++ b/src/CPackMacDeployQt.cmake.in @@ -1,4 +1,4 @@ execute_process(COMMAND "${MACDEPLOYQT_EXECUTABLE}" ${CMAKE_CURRENT_BINARY_DIR}/vnote.app -dmg - -always-overwrite -verbose=2 + -always-overwrite -verbose=1 WORKING_DIRECTORY ${CPACK_PACKAGE_DIRECTORY} ) diff --git a/src/Packaging.cmake b/src/Packaging.cmake index 37ae68df1f..b93669226b 100644 --- a/src/Packaging.cmake +++ b/src/Packaging.cmake @@ -102,7 +102,7 @@ set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/package/wix_dialog.png") set(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_BINARY_DIR}/BundleConfig.cmake") add_custom_target(pack - COMMAND ${CMAKE_CPACK_COMMAND} "--config" "${CMAKE_BINARY_DIR}/BundleConfig.cmake" + COMMAND ${CMAKE_CPACK_COMMAND} "--config" "${CMAKE_BINARY_DIR}/BundleConfig.cmake" "--verbose" COMMENT "Running CPACK. Please wait..." DEPENDS vnote) add_dependencies(pack lrelease) diff --git a/src/data/core/Info.plist b/src/data/core/Info.plist index 0e9609b914..7f39ee999d 100644 --- a/src/data/core/Info.plist +++ b/src/data/core/Info.plist @@ -18,26 +18,26 @@ + CFBundleName + VNote CFBundleExecutable vnote CFBundleShortVersionString - 3.17.0 + 3.17 CFBundleVersion - 3.17.0.1 + 3.17.0 NSHumanReadableCopyright - Created by VNoteX + Distributed under LGPL-3.0 license. Copyright (c) 2024 app.vnote.fun CFBundleIconFile vnote.icns CFBundleIdentifier fun.vnote.app CFBundlePackageType APPL - CFBundleSignature - ???? LSMinimumSystemVersion - 10.12 + 12.1 NOTE - Visit [GitHub VNote](https://github.com/vnotex/vnote) for details. + A pleasant note-taking platform NSPrincipalClass NSApplication NSSupportsAutomaticGraphicsSwitching