diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index b9ddd9ac3f..b1230460d4 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -150,6 +150,8 @@ 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") diff --git a/tools/nitpick/CMakeLists.txt b/tools/nitpick/CMakeLists.txt index 64c4d477a1..959eba4c56 100644 --- a/tools/nitpick/CMakeLists.txt +++ b/tools/nitpick/CMakeLists.txt @@ -74,11 +74,19 @@ elseif (APPLE) endif () # set the packaged nitpick folder depending on platform, so we can copy it -if (WIN32) +if (APPLE) + set(PACKAGED_NITPICK_FOLDER "Release/${NITPICK_EXEC_NAME}") +elseif (WIN32) set(PACKAGED_NITPICK_FOLDER "Release") endif () -if (WIN32) +if (APPLE) + install( + DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_NITPICK_FOLDER}" + USE_SOURCE_PERMISSIONS + DESTINATION ${NITPICK_INSTALL_DIR} + ) +elseif (WIN32) set(NITPICK_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_NITPICK_FOLDER}") install(