From bb04a85bdfa26f879daddac23d6b191d4bbd7a54 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 3 Apr 2019 11:33:28 +0200
Subject: [PATCH] Stop installing unnecessary things

This includes:
- tests
- tools that are only used duing the Qt build (tracegen and
  qfloat16-tables)

Change-Id: I3a5f678682b5b9318012568a9e4dcdda0967f89b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 cmake/QtBuild.cmake                      | 25 ++++++++++++++++--------
 src/tools/qfloat16-tables/CMakeLists.txt |  1 +
 src/tools/tracegen/CMakeLists.txt        |  1 +
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index f7d12c96ef..3c373ac862 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -770,7 +770,7 @@ endfunction()
 # Please consider to use a more specific version target like the one created
 # by add_qt_test or add_qt_tool below.
 function(add_qt_executable name)
-    qt_parse_all_arguments(arg "add_qt_executable" "GUI;BOOTSTRAP" "OUTPUT_DIRECTORY;INSTALL_DIRECTORY" "EXE_FLAGS;${__default_private_args}" ${ARGN})
+    qt_parse_all_arguments(arg "add_qt_executable" "GUI;BOOTSTRAP;NO_INSTALL" "OUTPUT_DIRECTORY;INSTALL_DIRECTORY" "EXE_FLAGS;${__default_private_args}" ${ARGN})
 
     if ("x${arg_OUTPUT_DIRECTORY}" STREQUAL "x")
         set(arg_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALL_BINDIR}")
@@ -816,9 +816,11 @@ function(add_qt_executable name)
         MACOSX_BUNDLE "${arg_GUI}"
     )
 
-    install(TARGETS "${name}"
-        RUNTIME DESTINATION "${arg_INSTALL_DIRECTORY}"
-        BUNDLE DESTINATION "${arg_INSTALL_DIRECTORY}")
+    if(NOT arg_NO_INSTALL)
+        install(TARGETS "${name}"
+            RUNTIME DESTINATION "${arg_INSTALL_DIRECTORY}"
+            BUNDLE DESTINATION "${arg_INSTALL_DIRECTORY}")
+    endif()
 endfunction()
 
 
@@ -826,9 +828,9 @@ endfunction()
 function(add_qt_test name)
     qt_parse_all_arguments(arg "add_qt_test" "RUN_SERIAL" "" "${__default_private_args}" ${ARGN})
     set(path "${CMAKE_CURRENT_BINARY_DIR}")
-    file(RELATIVE_PATH test_relative_src_dir ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
     add_qt_executable("${name}"
+        NO_INSTALL
         OUTPUT_DIRECTORY "${path}"
         SOURCES "${arg_SOURCES}"
         INCLUDE_DIRECTORIES
@@ -841,7 +843,6 @@ function(add_qt_test name)
         LINK_OPTIONS ${arg_LINK_OPTIONS}
         MOC_OPTIONS ${arg_MOC_OPTIONS}
         DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS}
-        INSTALL_DIRECTORY ${test_relative_src_dir}
     )
 
     add_test(NAME "${name}" COMMAND "${name}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
@@ -879,7 +880,7 @@ function(add_qt_tool name)
         return()
     endif()
 
-    qt_parse_all_arguments(arg "add_qt_tool" "BOOTSTRAP" "" "${__default_private_args}" ${ARGN})
+    qt_parse_all_arguments(arg "add_qt_tool" "BOOTSTRAP;NO_INSTALL" "" "${__default_private_args}" ${ARGN})
 
     set(disable_autogen_tools "${arg_DISABLE_AUTOGEN_TOOLS}")
     if (arg_BOOTSTRAP)
@@ -894,8 +895,14 @@ function(add_qt_tool name)
         set(bootstrap BOOTSTRAP)
     endif()
 
+    set(no_install "")
+    if(arg_NO_INSTALL)
+        set(no_install NO_INSTALL)
+    endif()
+
     add_qt_executable("${name}" OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALL_BINDIR}"
         ${bootstrap}
+        ${no_install}
         SOURCES ${arg_SOURCES}
         INCLUDE_DIRECTORIES
             ${arg_INCLUDE_DIRECTORIES}
@@ -908,7 +915,9 @@ function(add_qt_tool name)
     )
     qt_internal_add_target_aliases("${name}")
 
-    install(TARGETS "${name}" EXPORT "Qt${PROJECT_VERSION_MAJOR}ToolsTargets" DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
+    if(NOT arg_NO_INSTALL)
+        install(TARGETS "${name}" EXPORT "Qt${PROJECT_VERSION_MAJOR}ToolsTargets" DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
+    endif()
 endfunction()
 
 
diff --git a/src/tools/qfloat16-tables/CMakeLists.txt b/src/tools/qfloat16-tables/CMakeLists.txt
index f437ccc8db..304264f16f 100644
--- a/src/tools/qfloat16-tables/CMakeLists.txt
+++ b/src/tools/qfloat16-tables/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_tool(qfloat16-tables
     BOOTSTRAP
+    NO_INSTALL
     SOURCES
         gen_qfloat16_tables.cpp
     # CONFIG = "force_bootstrap"
diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt
index bfb33d77c5..1300b0c3bc 100644
--- a/src/tools/tracegen/CMakeLists.txt
+++ b/src/tools/tracegen/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_tool(tracegen
     BOOTSTRAP
+    NO_INSTALL
     SOURCES
         etw.cpp etw.h
         helpers.cpp helpers.h