From 4727123e5f95f941b94901a630545cc9bdad7f26 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Fri, 8 Feb 2019 10:25:18 -0800
Subject: [PATCH 1/2] Do not include nitpick in production builds.

---
 tools/CMakeLists.txt | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 886f15ded4..ea9d4b8496 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -19,20 +19,36 @@ function(check_test name)
 endfunction()
 
 if (BUILD_TOOLS)
-    set(ALL_TOOLS 
-        udt-test 
-        vhacd-util
-        frame-optimizer
-        gpu-frame-player
-        ice-client
-        ktx-tool
-        ac-client
-        skeleton-dump
-        atp-client
-        oven
-        nitpick
-    )
-
+    # Allow different tools for production builds
+    if (RELEASE_TYPE STREQUAL "PRODUCTION")
+        set(ALL_TOOLS 
+            udt-test 
+            vhacd-util
+            frame-optimizer
+            gpu-frame-player
+            ice-client
+            ktx-tool
+            ac-client
+            skeleton-dump
+            atp-client
+            oven
+        )
+    else()
+        set(ALL_TOOLS 
+            udt-test 
+            vhacd-util
+            frame-optimizer
+            gpu-frame-player
+            ice-client
+            ktx-tool
+            ac-client
+            skeleton-dump
+            atp-client
+            oven
+            ####nitpick
+        )
+    endif()
+    
     foreach(TOOL ${ALL_TOOLS})
         check_test(${TOOL})
         if (${BUILD_TOOL_RESULT})

From 6598f83d39435e5a945c6bd13d3357f9291d1a7b Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Fri, 8 Feb 2019 11:22:39 -0800
Subject: [PATCH 2/2] Removed debug code.

---
 tools/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index ea9d4b8496..4d7a594d92 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -45,7 +45,7 @@ if (BUILD_TOOLS)
             skeleton-dump
             atp-client
             oven
-            ####nitpick
+            nitpick
         )
     endif()