some macro renaming and cleanup

CMakeLists.txt

@@ -232,5 +232,5 @@ if (HIFI_MEMORY_DEBUGGING)
   endif (UNIX)
 endif ()
 
-include_application_version()
+set_packaging_parameters()
 generate_installers()

assignment-client/CMakeLists.txt

@@ -9,6 +9,5 @@ link_hifi_libraries(
   controllers physics
 )
 
-include_application_version()
 package_libraries_for_deployment()
-consolidate_stack_components()
+consolidate_installer_components()

cmake/macros/ConsolidateInstallerComponents.cmake

@@ -0,0 +1,26 @@
+macro(CONSOLIDATE_INSTALLER_COMPONENTS)
+
+  if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE AND WIN32)
+    # Copy icon files for interface and stack manager
+    if (TARGET_NAME STREQUAL "interface" OR TARGET_NAME STREQUAL "package-console")
+      if (TARGET_NAME STREQUAL "interface")
+        set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/icon/${INTERFACE_ICON}")
+        set (ICON_DESTINATION_NAME "interface.ico")
+      else ()
+        set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/assets/${STACK_MANAGER_ICON}")
+        set (ICON_DESTINATION_NAME "stack-manager.ico")
+      endif ()
+      add_custom_command(
+        TARGET ${TARGET_NAME} POST_BUILD
+        COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/package-bundle/${ICON_DESTINATION_NAME}
+        COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/package-bundle
+      )
+    else ()
+      add_custom_command(
+        TARGET ${TARGET_NAME} POST_BUILD
+        COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/package-bundle
+      )
+    endif ()
+  endif ()
+
+endmacro()

cmake/macros/ConsolidateStackComponents.cmake

@@ -1,28 +0,0 @@
-macro(CONSOLIDATE_STACK_COMPONENTS)
-
-  if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE)
-    if (WIN32)
-      # Copy icon files for interface and stack manager
-      if (TARGET_NAME STREQUAL "interface" OR TARGET_NAME STREQUAL "stack-manager")
-        if (TARGET_NAME STREQUAL "interface")
-          set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/icon/${INTERFACE_ICON}")
-          set (ICON_DESTINATION_NAME "interface.ico")
-        else ()
-          set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/assets/${STACK_MANAGER_ICON}")
-          set (ICON_DESTINATION_NAME "stack-manager.ico")
-        endif ()
-        add_custom_command(
-          TARGET ${TARGET_NAME} POST_BUILD
-          COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/package-bundle/${ICON_DESTINATION_NAME}
-          COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/package-bundle
-        )
-      else ()
-        add_custom_command(
-          TARGET ${TARGET_NAME} POST_BUILD
-          COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/package-bundle
-        )
-      endif ()
-    endif ()
-  endif ()
-
-endmacro()

cmake/macros/SetPackagingParameters.cmake

@@ -1,5 +1,5 @@
 #
-#  IncludeApplicationVersion.cmake
+#  SetPackagingParameters.cmake
 #  cmake/macros
 #
 #  Created by Leonardo Murillo on 07/14/2015.
@@ -7,12 +7,12 @@
 #
 #  Distributed under the Apache License, Version 2.0.
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-# 
 
-macro(INCLUDE_APPLICATION_VERSION)
+# This macro checks some Jenkins defined environment variables to determine the origin of this build
-  #
+# and decides how targets should be packaged.
-  # We are relying on Jenkins defined environment variables to determine the origin of this build
+
-  # and will only package if this is a PR or Release build
+macro(SET_PACKAGING_PARAMETERS)
+
   if (DEFINED ENV{JOB_ID})
     set(DEPLOY_PACKAGE 1)
     set(BUILD_SEQ $ENV{JOB_ID})
@@ -37,6 +37,9 @@ macro(INCLUDE_APPLICATION_VERSION)
     set(INTERFACE_ICON "interface-beta.ico")
     set(STACK_MANAGER_ICON "icon-beta.ico")
   endif ()
-  configure_file("${MACRO_DIR}/ApplicationVersion.h.in" "${PROJECT_BINARY_DIR}/includes/ApplicationVersion.h")
+
-  include_directories("${PROJECT_BINARY_DIR}/includes")
+  # create a header file our targets can use to find out the application version
-endmacro(INCLUDE_APPLICATION_VERSION)
+  file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/includes")
+  configure_file("${MACRO_DIR}/ApplicationVersion.h.in" "${CMAKE_BINARY_DIR}/includes/ApplicationVersion.h")
+
+endmacro(SET_PACKAGING_PARAMETERS)

cmake/macros/SetupHifiProject.cmake

@@ -15,6 +15,9 @@ macro(SETUP_HIFI_PROJECT)
 
   file(GLOB SRC_SUBDIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*)
 
+  # inlcude the generated application version header
+  include_directories("${CMAKE_BINARY_DIR}/includes")
+
   foreach(DIR ${SRC_SUBDIRS})
     if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/${DIR}")
       file(GLOB DIR_CONTENTS "src/${DIR}/*")

domain-server/CMakeLists.txt

@@ -36,6 +36,5 @@ if (UNIX)
   target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
 endif (UNIX)
 
-include_application_version()
 package_libraries_for_deployment()
-consolidate_stack_components()
+consolidate_installer_components()

interface/CMakeLists.txt

@@ -24,8 +24,6 @@ if (WIN32)
   add_definitions(-DWINDOWS_LEAN_AND_MEAN) # needed to make sure windows doesn't go to crazy with its defines
 endif()
 
-include_application_version()
-
 # grab the implementation and header files from src dirs
 file(GLOB_RECURSE INTERFACE_SRCS "src/*.cpp" "src/*.h")
 GroupSources("src")
@@ -229,4 +227,4 @@ if (WIN32)
 endif()
 
 package_libraries_for_deployment()
-consolidate_stack_components()
+consolidate_installer_components()

libraries/networking/CMakeLists.txt

@@ -31,4 +31,3 @@ endif (UNIX)
 
 # append tbb includes to our list of includes to bubble
 target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS})
-include_application_version()