Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 10:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP.

Browse source
This commit is contained in:
NissimHadar 2019-01-11 17:26:28 -08:00
parent 2f4f0b8d80
commit 9e61e3415c
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/macros/SetPackagingParameters.cmake
View file

@ -140,9 +140,9 @@ macro(SET_PACKAGING_PARAMETERS)
set(DMG_SUBFOLDER_ICON "${HF_CMAKE_DIR}/installer/install-folder.rsrc")
set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
set(NITPICK_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
set(NITPICK_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
if (CLIENT_ONLY)
set(CONSOLE_EXEC_NAME "Console.app")
@ -150,8 +150,6 @@ macro(SET_PACKAGING_PARAMETERS)
set(CONSOLE_EXEC_NAME "Sandbox.app")
endif()
set(NITPICK_EXEC_NAME "nitpick")
set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}")
set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")

8
tools/nitpick/CMakeLists.txt
View file

@ -73,12 +73,8 @@ elseif (APPLE)
)
endif ()
# set the packaged nitpick folder depending on platform, so we can copy it
if (APPLE)
set(PACKAGED_NITPICK_FOLDER "Release/${NITPICK_EXEC_NAME}")
elseif (WIN32)
set(PACKAGED_NITPICK_FOLDER "Release")
endif ()
# set the packaged nitpick folder so we can copy it
set(PACKAGED_NITPICK_FOLDER "Release")
if (APPLE)
install(