Merge branch '20550-installOnMac' of github.com:NissimHadar/hifi into 20550-installOnMac

.gitignore

@@ -104,4 +104,10 @@ tools/unity-avatar-exporter/Logs
 tools/unity-avatar-exporter/Packages
 tools/unity-avatar-exporter/ProjectSettings
 tools/unity-avatar-exporter/Temp
+<<<<<<< HEAD
 
+=======
+server-console/package-lock.json
+vcpkg/
+/tools/nitpick/compiledResources
+>>>>>>> c199654ded854157b9d11b6ede1b867b46356102

CMakeLists.txt

@@ -81,7 +81,7 @@ if (ANDROID)
   set(GLES_OPTION ON)
   set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
 else ()
-  set(PLATFORM_QT_COMPONENTS WebEngine)
+  set(PLATFORM_QT_COMPONENTS WebEngine Xml)
 endif ()
 
 if (USE_GLES AND (NOT ANDROID))

INSTALL.md

@@ -4,7 +4,8 @@ During generation, CMake should produce an `install` target and a `package` targ
 
 ### Install
 
-The `install` target will copy the High Fidelity targets and their dependencies to your `CMAKE_INSTALL_PREFIX`.
+The `install` target will copy the High Fidelity targets and their dependencies to your `CMAKE_INSTALL_PREFIX`.  
+This variable is set by the `project(hifi)` command in `CMakeLists.txt` to `C:/Program Files/hifi` and stored in `build/CMakeCache.txt`
 
 ### Packaging
 
@@ -14,17 +15,67 @@ To produce an installer, run the `package` target.
 
 To produce an executable installer on Windows, the following are required:
 
-- [Nullsoft Scriptable Install System](http://nsis.sourceforge.net/Download) - 3.0b3
-- [UAC Plug-in for Nullsoft](http://nsis.sourceforge.net/UAC_plug-in) - 0.2.4c
-- [nsProcess Plug-in for Nullsoft](http://nsis.sourceforge.net/NsProcess_plugin) - 1.6
-- [Inetc Plug-in for Nullsoft](http://nsis.sourceforge.net/Inetc_plug-in) - 1.0
-- [NSISpcre Plug-in for Nullsoft](http://nsis.sourceforge.net/NSISpcre_plug-in) - 1.0
-- [nsisSlideshow Plug-in for Nullsoft](http://nsis.sourceforge.net/NsisSlideshow_plug-in) - 1.7
-- [Nsisunz plug-in for Nullsoft](http://nsis.sourceforge.net/Nsisunz_plug-in)
-- [ApplicationID plug-in for Nullsoft](http://nsis.sourceforge.net/ApplicationID_plug-in) - 1.0
+1.  [7-zip](<https://www.7-zip.org/download.html>)  
 
-Run the `package` target to create an executable installer using the Nullsoft Scriptable Install System.
+1. [Nullsoft Scriptable Install System](http://nsis.sourceforge.net/Download) - 3.04  
+  Install using defaults (will install to `C:\Program Files (x86)\NSIS`)
+1. [UAC Plug-in for Nullsoft](http://nsis.sourceforge.net/UAC_plug-in) - 0.2.4c  
+    1. Extract Zip
+    1. Copy `UAC.nsh` to `C:\Program Files (x86)\NSIS\Include\`
+    1. Copy `Plugins\x86-ansi\UAC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+    1. Copy `Plugins\x86-unicode\UAC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+1. [nsProcess Plug-in for Nullsoft](http://nsis.sourceforge.net/NsProcess_plugin) - 1.6 (use the link marked **nsProcess_1_6.7z**)
+    1. Extract Zip
+    1. Copy `Include\nsProcess.nsh` to `C:\Program Files (x86)\NSIS\Include\`
+    1. Copy `Plugins\nsProcess.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+    1. Copy `Plugins\nsProcessW.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+
+1. [InetC Plug-in for Nullsoft](http://nsis.sourceforge.net/Inetc_plug-in) - 1.0
+    1. Extract Zip
+    1. Copy `Plugins\x86-ansi\InetC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+    1. Copy `Plugins\x86-unicode\InetC.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+    
+1. [NSISpcre Plug-in for Nullsoft](http://nsis.sourceforge.net/NSISpcre_plug-in) - 1.0
+    1. Extract Zip
+    1. Copy `NSISpre.nsh` to `C:\Program Files (x86)\NSIS\Include\`
+    1. Copy `NSISpre.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+
+1. [nsisSlideshow Plug-in for Nullsoft](<http://wiz0u.free.fr/prog/nsisSlideshow/>) - 1.7
+   1.  Extract Zip
+   1.  Copy `bin\nsisSlideshow.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+   1.  Copy `bin\nsisSlideshowW.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+
+1. [Nsisunz plug-in for Nullsoft](http://nsis.sourceforge.net/Nsisunz_plug-in)
+   1.  Download both Zips and unzip
+   1.  Copy `nsisunz\Release\nsisunz.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+   1.  Copy `NSISunzU\Plugin unicode\nsisunz.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+
+1. [ApplicationID plug-in for Nullsoft]() - 1.0
+   1.  Download [`Pre-built DLLs`](<https://github.com/connectiblutz/NSIS-ApplicationID/releases/download/1.1/NSIS-ApplicationID.zip>)
+   1.  Extract Zip
+   1.  Copy `Release\ApplicationID.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
+   1.  Copy `ReleaseUnicode\ApplicationID.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`
+
+1. [npm](<https://www.npmjs.com/get-npm>)
+    1.  Install version 10.15.0 LTS
+    
+1.  Perform a clean cmake from a new terminal.
+1.  Open the `hifi.sln` Solution and select the Release configuration.
+1.  Build the Solution.
+1.  Build `packaged-server-console` (found under **Server Console**)  
+    This will add 2 folders to `build\server-console\` -  
+    `server-console-win32-x64` and `x64`
+1.  Build CMakeTargets->PACKAGE  
+    Installer is now available in `build\_CPack_Packages\win64\NSIS`
 
 #### OS X
-
-Run the `package` target to create an Apple Disk Image (.dmg).
+1.   [npm](<https://www.npmjs.com/get-npm>)
+      Install version 10.15.0 LTS
+   
+1.  Perform a clean cmake.
+1.  Perform a Release build of ALL_BUILD
+1.  Perform a Release build of `packaged-server-console` 
+     This will add a folder to `build\server-console\` -  
+     Sandbox-darwin-x64
+1.  Perform a Release build of `package`
+      Installer is now available in `build/_CPack_Packages/Darwin/DragNDrop

cmake/macros/FixupNitpick.cmake

@@ -0,0 +1,36 @@
+#
+#  FixupNitpick.cmake
+#  cmake/macros
+#
+#  Copyright 2019 High Fidelity, Inc.
+#  Created by Nissim Hadar on January 14th, 2016
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+
+macro(fixup_nitpick)
+  if (APPLE)
+    string(REPLACE " " "\\ " ESCAPED_BUNDLE_NAME ${NITPICK_BUNDLE_NAME})
+    string(REPLACE " " "\\ " ESCAPED_INSTALL_PATH ${NITPICK_INSTALL_DIR})
+    set(_NITPICK_INSTALL_PATH "${ESCAPED_INSTALL_PATH}/${ESCAPED_BUNDLE_NAME}.app")
+
+    find_program(MACDEPLOYQT_COMMAND macdeployqt PATHS "${QT_DIR}/bin" NO_DEFAULT_PATH)
+
+    if (NOT MACDEPLOYQT_COMMAND AND (PRODUCTION_BUILD OR PR_BUILD))
+      message(FATAL_ERROR "Could not find macdeployqt at ${QT_DIR}/bin.\
+        It is required to produce a relocatable nitpick application.\
+        Check that the environment variable QT_DIR points to your Qt installation.\
+      ")
+    endif ()
+
+    install(CODE "
+      execute_process(COMMAND ${MACDEPLOYQT_COMMAND}\
+        \${CMAKE_INSTALL_PREFIX}/${_NITPICK_INSTALL_PATH}/\
+        -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/interface/resources/qml/\
+      )"
+      COMPONENT ${CLIENT_COMPONENT}
+    )
+
+  endif ()
+endmacro()

cmake/macros/SetPackagingParameters.cmake

@@ -77,6 +77,9 @@ macro(SET_PACKAGING_PARAMETERS)
     add_definitions(-DDEV_BUILD)
   endif ()
 
+  set(NITPICK_BUNDLE_NAME "nitpick")
+  set(NITPICK_ICON_PREFIX "nitpick")
+
   string(TIMESTAMP BUILD_TIME "%d/%m/%Y")
 
   # if STABLE_BUILD is 1, PRODUCTION_BUILD must be 1 and
@@ -140,8 +143,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})
 
     if (CLIENT_ONLY)
       set(CONSOLE_EXEC_NAME "Console.app")
@@ -159,11 +163,14 @@ macro(SET_PACKAGING_PARAMETERS)
 
     set(INTERFACE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${INTERFACE_BUNDLE_NAME}.app")
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns")
+    set(NITPICK_ICON_FILENAME "${NITPICK_ICON_PREFIX}.icns")
   else ()
     if (WIN32)
       set(CONSOLE_INSTALL_DIR "server-console")
+      set(NITPICK_INSTALL_DIR "nitpick")
     else ()
       set(CONSOLE_INSTALL_DIR ".")
+      set(NITPICK_INSTALL_DIR ".")
     endif ()
 
     set(COMPONENT_INSTALL_DIR ".")
@@ -173,6 +180,7 @@ macro(SET_PACKAGING_PARAMETERS)
   if (WIN32)
     set(INTERFACE_EXEC_PREFIX "interface")
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico")
+    set(NITPICK_ICON_FILENAME "${NITPICK_ICON_PREFIX}.ico")
 
     set(CONSOLE_EXEC_NAME "server-console.exe")
 

tools/CMakeLists.txt

@@ -2,35 +2,38 @@
 find_npm()
 
 if (NPM_EXECUTABLE)
-  add_subdirectory(jsdoc)
-  set_target_properties(jsdoc PROPERTIES FOLDER "Tools")
+    add_subdirectory(jsdoc)
+    set_target_properties(jsdoc PROPERTIES FOLDER "Tools")
 endif()
 
 if (BUILD_TOOLS)
-  add_subdirectory(udt-test)
-  set_target_properties(udt-test PROPERTIES FOLDER "Tools")
+    add_subdirectory(udt-test)
+    set_target_properties(udt-test PROPERTIES FOLDER "Tools")
 
-  add_subdirectory(vhacd-util)
-  set_target_properties(vhacd-util PROPERTIES FOLDER "Tools")
+    add_subdirectory(vhacd-util)
+    set_target_properties(vhacd-util PROPERTIES FOLDER "Tools")
 
-  add_subdirectory(ice-client)
-  set_target_properties(ice-client PROPERTIES FOLDER "Tools")
+    add_subdirectory(ice-client)
+    set_target_properties(ice-client PROPERTIES FOLDER "Tools")
 
-  add_subdirectory(ktx-tool)
-  set_target_properties(ktx-tool PROPERTIES FOLDER "Tools")
+    add_subdirectory(ktx-tool)
+    set_target_properties(ktx-tool PROPERTIES FOLDER "Tools")
 
-  add_subdirectory(ac-client)
-  set_target_properties(ac-client PROPERTIES FOLDER "Tools")
+    add_subdirectory(ac-client)
+    set_target_properties(ac-client PROPERTIES FOLDER "Tools")
 
-  add_subdirectory(skeleton-dump)
-  set_target_properties(skeleton-dump PROPERTIES FOLDER "Tools")
+    add_subdirectory(skeleton-dump)
+    set_target_properties(skeleton-dump PROPERTIES FOLDER "Tools")
 
-  add_subdirectory(atp-client)
-  set_target_properties(atp-client PROPERTIES FOLDER "Tools")
+    add_subdirectory(atp-client)
+    set_target_properties(atp-client PROPERTIES FOLDER "Tools")
 
-  add_subdirectory(oven)
-  set_target_properties(oven PROPERTIES FOLDER "Tools")
+    add_subdirectory(oven)
+    set_target_properties(oven PROPERTIES FOLDER "Tools")
 
-  add_subdirectory(nitpick)
-  set_target_properties(nitpick PROPERTIES FOLDER "Tools")
+    # No need to build on Android or in a Production build
+    if (NOT ANDROID AND NOT RELEASE_TYPE STREQUAL "PRODUCTION")
+        add_subdirectory(nitpick)
+        set_target_properties(nitpick PROPERTIES FOLDER "Tools")
+    endif()
 endif()

tools/nitpick/CMakeLists.txt

@@ -1,75 +1,197 @@
-set (TARGET_NAME nitpick)
+set(TARGET_NAME nitpick)
 project(${TARGET_NAME})
 
-# Automatically run UIC and MOC.  This replaces the older WRAP macros
-SET (CMAKE_AUTOUIC ON) 
-SET (CMAKE_AUTOMOC ON) 
+set(CUSTOM_NITPICK_QRC_PATHS "")
 
-setup_hifi_project (Core Widgets Network Xml)
-link_hifi_libraries ()
+find_npm()
 
-# FIX: Qt was built with -reduce-relocations
-if (Qt5_POSITION_INDEPENDENT_CODE)
-    SET (CMAKE_POSITION_INDEPENDENT_CODE ON)
-endif()
+set(RESOURCES_QRC ${CMAKE_CURRENT_BINARY_DIR}/resources.qrc)
+set(RESOURCES_RCC ${CMAKE_CURRENT_SOURCE_DIR}/compiledResources/resources.rcc)
+generate_qrc(OUTPUT ${RESOURCES_QRC} PATH ${CMAKE_CURRENT_SOURCE_DIR}/resources CUSTOM_PATHS ${CUSTOM_NITPICK_QRC_PATHS} GLOBS *)
 
-# Qt includes
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-include_directories (${Qt5Core_INCLUDE_DIRS})
-include_directories (${Qt5Widgets_INCLUDE_DIRS})
+add_custom_command(
+    OUTPUT ${RESOURCES_RCC}
+    DEPENDS ${RESOURCES_QRC} ${GENERATE_QRC_DEPENDS}
+    COMMAND "${QT_DIR}/bin/rcc"
+    ARGS ${RESOURCES_QRC} -binary -o ${RESOURCES_RCC}
+)
 
-set (QT_LIBRARIES Qt5::Core Qt5::Widgets QT::Gui Qt5::Xml)
+# grab the implementation and header files from src dirs
+file(GLOB_RECURSE NITPICK_SRCS "src/*.cpp" "src/*.h")
+GroupSources("src")
+list(APPEND NITPICK_SRCS ${RESOURCES_RCC})
 
-if (WIN32)
-    # Do not show Console
-    set_property (TARGET nitpick PROPERTY WIN32_EXECUTABLE true)
-endif()
+find_package(Qt5 COMPONENTS Widgets)
 
-target_zlib()
-add_dependency_external_projects (quazip)
-find_package (QuaZip REQUIRED)
-target_include_directories( ${TARGET_NAME} SYSTEM PUBLIC ${QUAZIP_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} ${QUAZIP_LIBRARIES})
- 
-package_libraries_for_deployment()
+# grab the ui files in ui
+file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
+source_group("UI Files" FILES ${QT_UI_FILES})
 
-if (WIN32)
-    add_paths_to_fixup_libs (${QUAZIP_DLL_PATH})
+# have qt5 wrap them and generate the appropriate header files
+qt5_wrap_ui(QT_UI_HEADERS "${QT_UI_FILES}")
 
-    find_program(WINDEPLOYQT_COMMAND windeployqt PATHS ${QT_DIR}/bin NO_DEFAULT_PATH)
-    
-    if (NOT WINDEPLOYQT_COMMAND)
-      message(FATAL_ERROR "Could not find windeployqt at ${QT_DIR}/bin. windeployqt is required.")
+# add them to the nitpick source files
+set(NITPICK_SRCS ${NITPICK_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}")
+
+if (APPLE)
+    # configure CMake to use a custom Info.plist
+    set_target_properties(${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in)
+
+    if (PRODUCTION_BUILD)
+        set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.nitpick)
+    else ()
+        if (DEV_BUILD)
+            set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.nitpick-dev)
+        elseif (PR_BUILD)
+            set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.nitpick-pr)
+        endif ()
     endif ()
 
-    # add a post-build command to call windeployqt to copy Qt plugins
-    add_custom_command(
-      TARGET ${TARGET_NAME}
-      POST_BUILD
-      COMMAND CMD /C "SET PATH=%PATH%;${QT_DIR}/bin && ${WINDEPLOYQT_COMMAND} ${EXTRA_DEPLOY_OPTIONS} $<$<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>,$<CONFIG:RelWithDebInfo>>:--release> \"$<TARGET_FILE:${TARGET_NAME}>\""
-    )
-        
-    # add a custom command to copy the empty Apps/Data High Fidelity folder (i.e. - a valid folder with no entities)
-    # this also copied to the containing folder, to facilitate running from Visual Studio
-    add_custom_command(
-        TARGET ${TARGET_NAME}
-        POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity"
-        COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "AppDataHighFidelity"
-    )
-        
-    # add a custom command to copy the SSL DLLs
-    add_custom_command(
-        TARGET ${TARGET_NAME}
-        POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E copy_directory "$ENV{VCPKG_ROOT}/installed/x64-windows/bin" "$<TARGET_FILE_DIR:${TARGET_NAME}>"
-    )
-elseif (APPLE)
-    # add a custom command to copy the empty Apps/Data High Fidelity folder (i.e. - a valid folder with no entities)
-    add_custom_command(
-        TARGET ${TARGET_NAME}
-        POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity"
-    )
+    # set how the icon shows up in the Info.plist file
+    set(MACOSX_BUNDLE_ICON_FILE "${NITPICK_ICON_FILENAME}")
+
+    # set where in the bundle to put the resources file
+    set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/icon/${NITPICK_ICON_FILENAME} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+
+    # append the discovered resources to our list of nitpick sources
+    list(APPEND NITPICK_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/icon/${NITPICK_ICON_FILENAME})
+endif()
+
+# create the executable, make it a bundle on OS X
+if (APPLE)
+    add_executable(${TARGET_NAME} MACOSX_BUNDLE ${NITPICK_SRCS} ${QM})
+
+    # make sure the output name for the .app bundle is correct
+    # Fix up the rpath so macdeployqt works
+    set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
+elseif (WIN32)
+    # configure an rc file for the chosen icon
+    set(CONFIGURE_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icon/${NITPICK_ICON_FILENAME}")
+    set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
+    configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})
+
+    set(APP_FULL_NAME "High Fidelity Nitpick")
+    set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc")
+    configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT})
+
+    # add an executable that also has the icon itself and the configured rc file as resources
+    add_executable(${TARGET_NAME} WIN32 ${NITPICK_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT} ${CONFIGURE_VERSION_INFO_RC_OUTPUT})
+else ()
+    add_executable(${TARGET_NAME} ${NITPICK_SRCS} ${QM})
 endif ()
 
+add_dependencies(${TARGET_NAME} resources)
+
+# disable /OPT:REF and /OPT:ICF for the Debug builds
+# This will prevent the following linker warnings
+# LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification
+if (WIN32)
+    set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG "/OPT:NOREF /OPT:NOICF")
+endif()
+
+link_hifi_libraries(entities-renderer)
+
+# perform standard include and linking for found externals
+foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
+    if (${${EXTERNAL}_UPPERCASE}_REQUIRED)
+        find_package(${EXTERNAL} REQUIRED)
+    else ()
+        find_package(${EXTERNAL})
+    endif ()
+
+    if (${${EXTERNAL}_UPPERCASE}_FOUND AND NOT DISABLE_${${EXTERNAL}_UPPERCASE})
+        add_definitions(-DHAVE_${${EXTERNAL}_UPPERCASE})
+
+        # include the library directories (ignoring warnings)
+        if (NOT ${${EXTERNAL}_UPPERCASE}_INCLUDE_DIRS)
+            set(${${EXTERNAL}_UPPERCASE}_INCLUDE_DIRS ${${${EXTERNAL}_UPPERCASE}_INCLUDE_DIR})
+        endif ()
+
+        include_directories(SYSTEM ${${${EXTERNAL}_UPPERCASE}_INCLUDE_DIRS})
+
+        # perform the system include hack for OS X to ignore warnings
+        if (APPLE)
+            foreach(EXTERNAL_INCLUDE_DIR  ${${${EXTERNAL}_UPPERCASE}_INCLUDE_DIRS})
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${EXTERNAL_INCLUDE_DIR}")
+        endforeach()
+        endif ()
+
+        if (NOT ${${EXTERNAL}_UPPERCASE}_LIBRARIES)
+            set(${${EXTERNAL}_UPPERCASE}_LIBRARIES ${${${EXTERNAL}_UPPERCASE}_LIBRARY})
+        endif ()
+
+        if (NOT APPLE OR NOT ${${EXTERNAL}_UPPERCASE} MATCHES "SIXENSE")
+            target_link_libraries(${TARGET_NAME} ${${${EXTERNAL}_UPPERCASE}_LIBRARIES})
+        elseif (APPLE AND NOT INSTALLER_BUILD)
+            add_definitions(-DSIXENSE_LIB_FILENAME=\"${${${EXTERNAL}_UPPERCASE}_LIBRARY_RELEASE}\")
+        endif ()
+    endif ()
+endforeach()
+
+# include headers for nitpick and NitpickConfig.
+include_directories("${PROJECT_SOURCE_DIR}/src")
+
+if (UNIX AND NOT ANDROID)
+    if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+        # Linux
+        target_link_libraries(${TARGET_NAME} pthread atomic)
+    else ()
+        # OSX
+        target_link_libraries(${TARGET_NAME} pthread)
+    endif ()
+endif()
+
+# add a custom command to copy the empty AppData High Fidelity folder (i.e. - a valid folder with no entities)
+if (WIN32)
+    add_custom_command(
+        TARGET ${TARGET_NAME}
+        POST_BUILD
+        COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity"
+    )
+    
+    if (RELEASE_TYPE STREQUAL "DEV")
+        # This to enable running from the IDE
+        add_custom_command(
+          TARGET ${TARGET_NAME}
+          POST_BUILD
+          COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "AppDataHighFidelity"
+        )
+    endif ()
+elseif (APPLE)
+    add_custom_command(
+        TARGET ${TARGET_NAME}
+        POST_BUILD
+        COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/AppDataHighFidelity" "$<TARGET_FILE_DIR:${TARGET_NAME}>/AppDataHighFidelity"
+    )
+endif()
+
+if (APPLE)
+    # setup install of OS X nitpick bundle
+    install(TARGETS ${TARGET_NAME}
+        BUNDLE DESTINATION ${NITPICK_INSTALL_DIR}
+        COMPONENT ${CLIENT_COMPONENT}
+    )
+
+    # call the fixup_nitpick macro to add required bundling commands for installation
+    fixup_nitpick()
+elseif (WIN32)
+    # link target to external libraries
+    # setup install of executable and things copied by fixup/windeployqt
+    install(
+        DIRECTORY "$<TARGET_FILE_DIR:${TARGET_NAME}>/"
+        DESTINATION ${NITPICK_INSTALL_DIR}
+        COMPONENT ${CLIENT_COMPONENT}
+        PATTERN "*.pdb" EXCLUDE
+        PATTERN "*.lib" EXCLUDE
+        PATTERN "*.exp" EXCLUDE
+    )
+endif()
+
+if (WIN32)
+    set(EXTRA_DEPLOY_OPTIONS "--qmldir  \"${PROJECT_SOURCE_DIR}/resources/qml\"")
+
+    set(TARGET_INSTALL_DIR ${NITPICK_INSTALL_DIR})
+    set(TARGET_INSTALL_COMPONENT ${CLIENT_COMPONENT})
+
+    package_libraries_for_deployment()
+endif()

tools/nitpick/src/AWSInterface.h

@@ -16,7 +16,7 @@
 #include <QObject>
 #include <QTextStream>
 
-#include "ui/BusyWindow.h"
+#include "BusyWindow.h"
 
 #include "PythonInterface.h"
 

tools/nitpick/src/MismatchWindow.h

@@ -12,7 +12,7 @@
 
 #include "ui_MismatchWindow.h"
 
-#include "../common.h"
+#include "common.h"
 
 class MismatchWindow : public QDialog, public Ui::MismatchWindow {
     Q_OBJECT

tools/nitpick/src/Nitpick.cpp

@@ -38,7 +38,7 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
    _ui.statusLabel->setText("");
    _ui.plainTextEdit->setReadOnly(true);
 
-   setWindowTitle("Nitpick - v1.3.2");
+   setWindowTitle("Nitpick - v1.3.3");
 }
 
 Nitpick::~Nitpick() {

tools/nitpick/src/Nitpick.h

@@ -15,11 +15,11 @@
 #include <QTextEdit>
 #include "ui_Nitpick.h"
 
-#include "../Downloader.h"
-#include "../Test.h"
+#include "Downloader.h"
+#include "Test.h"
 
-#include "../TestRunner.h"
-#include "../AWSInterface.h"
+#include "TestRunner.h"
+#include "AWSInterface.h"
 
 class Nitpick : public QMainWindow {
     Q_OBJECT

tools/nitpick/src/Test.cpp

@@ -19,7 +19,7 @@
 #include <quazip5/quazip.h>
 #include <quazip5/JlCompress.h>
 
-#include "ui/Nitpick.h"
+#include "Nitpick.h"
 extern Nitpick* nitpick;
 
 #include <math.h>

tools/nitpick/src/Test.h

@@ -18,7 +18,7 @@
 
 #include "AWSInterface.h"
 #include "ImageComparer.h"
-#include "ui/MismatchWindow.h"
+#include "MismatchWindow.h"
 #include "TestRailInterface.h"
 
 class Step {

tools/nitpick/src/TestRailInterface.h

@@ -11,10 +11,10 @@
 #ifndef hifi_test_testrail_interface_h
 #define hifi_test_testrail_interface_h
 
-#include "ui/BusyWindow.h"
-#include "ui/TestRailTestCasesSelectorWindow.h"
-#include "ui/TestRailRunSelectorWindow.h"
-#include "ui/TestRailResultsSelectorWindow.h"
+#include "BusyWindow.h"
+#include "TestRailTestCasesSelectorWindow.h"
+#include "TestRailRunSelectorWindow.h"
+#include "TestRailResultsSelectorWindow.h"
 
 #include <QDirIterator>
 #include <QtXml/QDomDocument>

tools/nitpick/src/TestRunner.cpp

@@ -13,7 +13,7 @@
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QFileDialog>
 
-#include "ui/Nitpick.h"
+#include "Nitpick.h"
 extern Nitpick* nitpick;
 
 #ifdef Q_OS_WIN
@@ -355,7 +355,18 @@ void TestRunner::saveExistingHighFidelityAppDataFolder() {
     }
 
     // Copy an "empty" AppData folder (i.e. no entities)
-    copyFolder(QDir::currentPath() + "/AppDataHighFidelity", _appDataFolder.path());
+    QDir canonicalAppDataFolder;
+#ifdef Q_OS_WIN
+    canonicalAppDataFolder = QDir::currentPath() + "/AppDataHighFidelity";
+#elif defined Q_OS_MAC
+    canonicalAppDataFolder = QCoreApplication::applicationDirPath() + "/AppDataHighFidelity";
+#endif
+    if (canonicalAppDataFolder.exists()) {
+        copyFolder(canonicalAppDataFolder.path(), _appDataFolder.path());
+    } else {
+        QMessageBox::critical(0, "Internal error", "The nitpick AppData folder cannot be found at:\n" + canonicalAppDataFolder.path());
+        exit(-1);
+    }
 }
 
 void TestRunner::createSnapshotFolder() {

tools/nitpick/src/main.cpp

@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 #include <QtWidgets/QApplication>
-#include "ui/Nitpick.h"
+#include "Nitpick.h"
 
 #include <iostream>