Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup

This commit is contained in:
Roxanne Skelly 2018-09-27 15:22:38 -07:00
commit 57fcdddea2

View file

@ -33,13 +33,13 @@ endif ()
# install the packaged Server Console in our install directory
if (APPLE)
install(
PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}"
DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}"
DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT}
COMPONENT ${CLIENT_COMPONENT}
)
install(
PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}"
DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}"
DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${CLIENT_COMPONENT}
)