From 9e252f0b08211738167aa8421514cb0ea1183c47 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 4 Jan 2016 15:18:57 -0800
Subject: [PATCH] exclude targets from all build, include app version

---
 cmake/macros/GenerateInstallers.cmake | 2 +-
 cmake/macros/SetupHifiProject.cmake   | 6 +++---
 console/CMakeLists.txt                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index 1dcfc6ec81..18e5c190a6 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -27,6 +27,6 @@ macro(GENERATE_INSTALLERS)
       COMMAND CMD /C "\"${MAKENSIS_COMMAND}\" ${CMAKE_SOURCE_DIR}/tools/nsis/release.nsi"
     )
 
-    set_target_properties(build-package PROPERTIES FOLDER "Installer")
+    set_target_properties(build-package PROPERTIES EXCLUDE_FROM_ALL TRUE FOLDER "Installer")
   endif ()
 endmacro()
diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake
index d06eb3dcfb..302cad090b 100644
--- a/cmake/macros/SetupHifiProject.cmake
+++ b/cmake/macros/SetupHifiProject.cmake
@@ -15,9 +15,6 @@ 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}/*")
@@ -31,6 +28,9 @@ macro(SETUP_HIFI_PROJECT)
     add_executable(${TARGET_NAME} ${TARGET_SRCS} ${AUTOMTC_SRC} ${AUTOSCRIBE_SHADER_LIB_SRC})
   endif()
 
+  # include the generated application version header
+  target_include_directories(${TARGET_NAME} "${CMAKE_BINARY_DIR}/includes")
+
   set(${TARGET_NAME}_DEPENDENCY_QT_MODULES ${ARGN})
   list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)
 
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 42f1870a1b..83e8d48f65 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -15,6 +15,6 @@ add_custom_target(${TARGET_NAME}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Installer")
+set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE FOLDER "Installer")
 
 consolidate_installer_components()