diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 7817b9f520..f6684fe0e8 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -83,12 +83,18 @@ if (APPLE) set(MACOSX_BUNDLE_BUNDLE_NAME Interface) set(MACOSX_BUNDLE_GUI_IDENTIFIER io.highfidelity.Interface) - + + if (CMAKE_BUILD_TYPE EQUAL "RELEASE") + set(ICON_FILENAME "Interface.icns") + else () + set(ICON_FILENAME "Interface-beta.icns") + endif () + # set how the icon shows up in the Info.plist file - SET(MACOSX_BUNDLE_ICON_FILE interface.icns) + SET(MACOSX_BUNDLE_ICON_FILE "${ICON_FILENAME}") # set where in the bundle to put the resources file - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/interface.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/icon/${ICON_FILENAME} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) # grab the directories in resources and put them in the right spot in Resources file(GLOB RESOURCE_SUBDIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/resources" "${CMAKE_CURRENT_SOURCE_DIR}/resources/*") @@ -101,7 +107,7 @@ if (APPLE) endif() endforeach() - SET(INTERFACE_SRCS ${INTERFACE_SRCS} "${CMAKE_CURRENT_SOURCE_DIR}/interface.icns") + SET(INTERFACE_SRCS ${INTERFACE_SRCS} "${CMAKE_CURRENT_SOURCE_DIR}/icon/${ICON_FILENAME}") endif() # create the executable, make it a bundle on OS X diff --git a/interface/icon/Interface-beta.icns b/interface/icon/Interface-beta.icns new file mode 100644 index 0000000000..15b373767a Binary files /dev/null and b/interface/icon/Interface-beta.icns differ diff --git a/interface/icon/Interface-beta.ico b/interface/icon/Interface-beta.ico new file mode 100644 index 0000000000..4d59dab12e Binary files /dev/null and b/interface/icon/Interface-beta.ico differ diff --git a/interface/icon/Interface.icns b/interface/icon/Interface.icns new file mode 100644 index 0000000000..d62e6127a0 Binary files /dev/null and b/interface/icon/Interface.icns differ diff --git a/interface/icon/Interface.ico b/interface/icon/Interface.ico new file mode 100644 index 0000000000..4799dc7c0d Binary files /dev/null and b/interface/icon/Interface.ico differ diff --git a/interface/interface.icns b/interface/interface.icns deleted file mode 100644 index 6e7a748d4d..0000000000 Binary files a/interface/interface.icns and /dev/null differ