Add icon to MacOS build
This commit is contained in:
1 parent
3745a687cb
commit
dea3dd93d5
3 files changed
+23
-12
No files matched your search
+12
-10
@@ -1,6 +1,18 @@
|
|||||||
fail_fast: false
|
fail_fast: false
|
||||||
|
|
||||||
repos:
|
repos:
|
||||||
|
- repo: https://github.com/cheshirekow/cmake-format-precommit
|
||||||
|
rev: v0.6.10
|
||||||
|
hooks:
|
||||||
|
- id: cmake-format
|
||||||
|
- id: cmake-lint
|
||||||
|
|
||||||
|
- repo: https://github.com/pocc/pre-commit-hooks
|
||||||
|
rev: v1.1.1
|
||||||
|
hooks:
|
||||||
|
- id: clang-format
|
||||||
|
args: [--style=file, -i]
|
||||||
|
|
||||||
- repo: local
|
- repo: local
|
||||||
hooks:
|
hooks:
|
||||||
- id: cmake-configure
|
- id: cmake-configure
|
||||||
@@ -14,14 +26,4 @@ repos:
|
|||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
language: system
|
language: system
|
||||||
|
|
||||||
- repo: https://github.com/cheshirekow/cmake-format-precommit
|
|
||||||
rev: v0.6.10
|
|
||||||
hooks:
|
|
||||||
- id: cmake-format
|
|
||||||
- id: cmake-lint
|
|
||||||
|
|
||||||
- repo: https://github.com/pocc/pre-commit-hooks
|
|
||||||
rev: v1.1.1
|
|
||||||
hooks:
|
|
||||||
- id: clang-format
|
|
||||||
args: [--style=file, -i]
|
|
||||||
+11
-2
@@ -142,9 +142,18 @@ IF(WIN32)
|
|||||||
COMMENT "Add icon on windows platform"
|
COMMENT "Add icon on windows platform"
|
||||||
)
|
)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
ADD_EXECUTABLE(${PROJECT_NAME} ${Calyp_App_SRCS} ${HEADERS_MOC_FILES} ${Calyp_App_UI_Wrap} ${Calyp_App_RCC} ${WINDOWS_RES_FILE})
|
||||||
|
ELSEIF(CMAKE_HOST_APPLE)
|
||||||
|
SET(CMAKE_MACOSX_BUNDLE ON)
|
||||||
|
SET(MACOSX_BUNDLE_EXECUTABLE_NAME ${PROJECT_NAME})
|
||||||
|
SET(MACOSX_BUNDLE_ICON_FILE Contents/Resources/calyp.icns)
|
||||||
|
SET(MACOSX_BUNDLE_BUNDLE_NAME Calyp)
|
||||||
|
SET(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/resources/calyp.icns)
|
||||||
|
SET_SOURCE_FILES_PROPERTIES(${APP_ICON_MACOSX} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
|
||||||
|
ADD_EXECUTABLE(${PROJECT_NAME} MACOSX_BUNDLE ${Calyp_App_SRCS} ${HEADERS_MOC_FILES} ${Calyp_App_UI_Wrap} ${Calyp_App_RCC} ${APP_ICON_MACOSX})
|
||||||
|
ELSE()
|
||||||
|
ADD_EXECUTABLE(${PROJECT_NAME} ${Calyp_App_SRCS} ${HEADERS_MOC_FILES} ${Calyp_App_UI_Wrap} ${Calyp_App_RCC})
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
ADD_EXECUTABLE(${PROJECT_NAME} ${Calyp_App_SRCS} ${HEADERS_MOC_FILES} ${Calyp_App_UI_Wrap} ${Calyp_App_RCC} ${WINDOWS_RES_FILE})
|
|
||||||
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${PROJECT_LIBRARY} CalypModules ${APP_LINKER_LIBS} ${QT_LINKER_LIBS} QCustomPlotLib)
|
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${PROJECT_LIBRARY} CalypModules ${APP_LINKER_LIBS} ${QT_LINKER_LIBS} QCustomPlotLib)
|
||||||
|
|
||||||
# QT5_USE_MODULES( ${PROJECT_NAME} ${QT_MODULES} )
|
# QT5_USE_MODULES( ${PROJECT_NAME} ${QT_MODULES} )
|
||||||
|
|||||||
Binary file not shown.
Reference in new issue
Block a user