A bit of Apps & Tools CMakeLists cleanup

Co-Authored-By: dgelessus <dgelessus@users.noreply.github.com>
H-uru · Oct 19, 2023 · f8573e0 · f8573e0
1 parent 068a76b
commit f8573e0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -195,7 +195,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
@@ -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
@@ -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)