diff --git a/CMakeLists.txt b/CMakeLists.txt index f36e1a6..7cff849 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required(VERSION 3.12) # 3.15 -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version") +if(APPLE) + message(STATUS "APPLE DETECTED. Set CMAKE_OSX_ARCHITECTURES to arm64 to build for Apple Silicon") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version") +endif() project(fastpathology) set(VERSION_MAJOR 1) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 010071e..332fa88 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -222,7 +222,11 @@ elseif(APPLE) # Create APP Bundle set(CPACK_GENERATOR "Bundle") set(CPACK_BUNDLE_NAME "FastPathology") - set(CPACK_PACKAGE_FILE_NAME "fastpathology_macos${CMAKE_OSX_DEPLOYMENT_TARGET}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") + if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64") + set(CPACK_PACKAGE_FILE_NAME "fastpathology_macos${CMAKE_OSX_DEPLOYMENT_TARGET}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}_${CMAKE_OSX_ARCHITECTURES}") + else() + set(CPACK_PACKAGE_FILE_NAME "fastpathology_macos${CMAKE_OSX_DEPLOYMENT_TARGET}_${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}_x86_64") + endif() set(CPACK_BUNDLE_ICON "${PROJECT_SOURCE_DIR}/data/Icons/fastpathology_logo_large.icns") configure_file( "${PROJECT_SOURCE_DIR}/misc/Info.plist.in"