From 29d8e15d9e67c8a41d125c6fde088a06d4ddb5fd Mon Sep 17 00:00:00 2001
From: Darryl Pogue <darryl@dpogue.ca>
Date: Tue, 3 Oct 2023 21:02:06 -0700
Subject: [PATCH] A bit of Apps & Tools CMakeLists cleanup

Co-Authored-By: dgelessus <dgelessus@users.noreply.github.com>
---
 CMakeLists.txt                     |  5 +++-
 Sources/Plasma/Apps/CMakeLists.txt | 17 +++++--------
 Sources/Tools/CMakeLists.txt       | 39 ++++++++++++++----------------
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24f3192654..c3f64015e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,7 +206,10 @@ set(PLASMA_TOOLS_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/Sources/Tools")
 
 add_subdirectory(Scripts)
 add_subdirectory(Sources/Plasma)
-add_subdirectory(Sources/Tools)
+
+if(PLASMA_BUILD_TOOLS)
+    add_subdirectory(Sources/Tools)
+endif()
 
 if(PLASMA_BUILD_TESTS)
     enable_testing()
diff --git a/Sources/Plasma/Apps/CMakeLists.txt b/Sources/Plasma/Apps/CMakeLists.txt
index 6c0a17c922..db734838d5 100644
--- a/Sources/Plasma/Apps/CMakeLists.txt
+++ b/Sources/Plasma/Apps/CMakeLists.txt
@@ -3,21 +3,16 @@ include_directories("${PLASMA_SOURCE_ROOT}/FeatureLib")
 include_directories("${PLASMA_SOURCE_ROOT}/NucleusLib")
 include_directories("${PLASMA_SOURCE_ROOT}/PubUtilLib")
 
-if(WIN32)
-    if(PLASMA_BUILD_CLIENT)
-        add_subdirectory(plClient)
-        add_subdirectory(plCrashHandler)
-    endif()
+if(PLASMA_BUILD_CLIENT)
+    add_subdirectory(plClient)
 
-    if(PLASMA_BUILD_LAUNCHER)
-        add_subdirectory(plUruLauncher)
+    if(WIN32)
+        add_subdirectory(plCrashHandler)
     endif()
 endif()
 
-if(APPLE)
-    if(PLASMA_BUILD_CLIENT)
-        add_subdirectory(plClient)
-    endif()
+if(PLASMA_BUILD_LAUNCHER AND WIN32)
+    add_subdirectory(plUruLauncher)
 endif()
 
 if(PLASMA_BUILD_TOOLS)
diff --git a/Sources/Tools/CMakeLists.txt b/Sources/Tools/CMakeLists.txt
index a7f1b070ae..25c4f889bf 100644
--- a/Sources/Tools/CMakeLists.txt
+++ b/Sources/Tools/CMakeLists.txt
@@ -3,33 +3,30 @@ include_directories("${PLASMA_SOURCE_ROOT}/FeatureLib")
 include_directories("${PLASMA_SOURCE_ROOT}/NucleusLib")
 include_directories("${PLASMA_SOURCE_ROOT}/PubUtilLib")
 
-if(PLASMA_BUILD_TOOLS)
-    add_subdirectory(plSystemInfo)
-    add_subdirectory(plFileEncrypt)
-    add_subdirectory(plFilePatcher)
-    add_subdirectory(plFileSecure)
-    add_subdirectory(plPageInfo)
-    add_subdirectory(plPageOptimizer)
-    add_subdirectory(plPythonPack)
-
-    if(Qt_FOUND)
-        add_subdirectory(plLocalizationEditor)
-        if(WIN32)
-            add_subdirectory(plNetLog)
-        endif()
-        add_subdirectory(plResBrowser)
-    endif()
+add_subdirectory(plFileEncrypt)
+add_subdirectory(plFilePatcher)
+add_subdirectory(plFileSecure)
+add_subdirectory(plLocalizationBenchmark)
+add_subdirectory(plPageInfo)
+add_subdirectory(plPageOptimizer)
+add_subdirectory(plPythonPack)
+add_subdirectory(plSystemInfo)
 
+if(Qt_FOUND)
+    add_subdirectory(plLocalizationEditor)
     if(WIN32)
-        add_subdirectory(plShaderAssembler)
+        add_subdirectory(plNetLog)
     endif()
+    add_subdirectory(plResBrowser)
+endif()
 
-    if(TARGET freetype AND Qt_FOUND)
-        add_subdirectory(plFontConverter)
-    endif()
+if(WIN32)
+    add_subdirectory(plShaderAssembler)
 endif()
 
-add_subdirectory(plLocalizationBenchmark)
+if(TARGET freetype AND Qt_FOUND)
+    add_subdirectory(plFontConverter)
+endif()
 
 # Max Stuff goes below here...
 if(PLASMA_BUILD_MAX_PLUGIN)