fix

vnotex · May 20, 2024 · e1c0b35 · e1c0b35
1 parent 57bcb07
commit e1c0b35
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          brew install tree
+          brew install tree libiodbc
 
       - name: Install a fresh CMake
         run: |

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -124,7 +124,7 @@ if (WIN32)
 elseif(APPLE)
     set(CMAKE_MACOSX_BUNDLE ON)
     set(CMAKE_MACOSX_RPATH ON)
-    install(TARGETS vnote BUNDLE DESTINATION . RUNTIME DESTINATION .)
+    install(TARGETS vnote BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
     set_target_properties(vnote
         PROPERTIES
         MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"

diff --git a/src/CPackMacDeployQt.cmake.in b/src/CPackMacDeployQt.cmake.in
@@ -1,4 +1,4 @@
-execute_process(COMMAND "${MACDEPLOYQT_EXECUTABLE}" ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app -dmg
-    --always-overwirte
+execute_process(COMMAND "${MACDEPLOYQT_EXECUTABLE}" ${CMAKE_CURRENT_BINARY_DIR}/vnote.app -dmg
+    -always-overwrite
     WORKING_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}
 )
diff --git a/src/Packaging.cmake b/src/Packaging.cmake
@@ -131,7 +131,7 @@ elseif(APPLE)
         message(STATUS "Package generation - MacOS - DMG")
 
         list(APPEND CPACK_GENERATOR External)
-        set(CPACK_BUNDLE_NAME "vnote" )
+        set(CPACK_BUNDLE_NAME "${PROJECT_NAME}" )
         set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_LIST_DIR}/data/core/Info.plist")
         set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_LIST_DIR}/data/core/icons/vnote.icns")
         set(CPACK_DMG_VOLUME_NAME "${PROJECT_NAME}")