Merge pull request #338 from Mystler/moar-cmake

Allow disabling supplemental projects with CMake

CMakeLists.txt

@@ -99,6 +99,11 @@ if(PLASMA_TARGETS STREQUAL "Ethereal")
     add_definitions(-DSTREAM_LOGGER)
 endif(PLASMA_TARGETS STREQUAL "Ethereal")
 
+#Allow us to disable certain parts of the build
+option(PLASMA_BUILD_RESOURCE_DAT "Do we want to build resource.dat?" ON)
+option(PLASMA_BUILD_LAUNCHER "Do we want to build plUruLauncher?" ON)
+option(PLASMA_BUILD_TOOLS "Do we want to build the Plasma tools?" ON)
+
 option(USE_VLD "Build and link with Visual Leak Detector (MSVC only)" OFF)
 if(USE_VLD)
     add_definitions(-DUSE_VLD)

Sources/Plasma/Apps/CMakeLists.txt

@@ -1,9 +1,15 @@
 add_subdirectory(plClient)
-add_subdirectory(plClientPatcher)
 add_subdirectory(plCrashHandler)
-add_subdirectory(plPythonPack)
-add_subdirectory(plUruLauncher)
-add_subdirectory(plFileSecure)
-add_subdirectory(plFileEncrypt)
-add_subdirectory(plPageInfo)
-add_subdirectory(plPageOptimizer)
+
+if(PLASMA_BUILD_LAUNCHER)
+    add_subdirectory(plUruLauncher)
+endif()
+
+if(PLASMA_BUILD_TOOLS)
+    add_subdirectory(plClientPatcher)
+    add_subdirectory(plPythonPack)
+    add_subdirectory(plFileSecure)
+    add_subdirectory(plFileEncrypt)
+    add_subdirectory(plPageInfo)
+    add_subdirectory(plPageOptimizer)
+endif()

Sources/Plasma/Apps/plClient/CMakeLists.txt

@@ -23,12 +23,10 @@ if(PYTHONINTERP_FOUND)
     find_python_module(rsvg)
     find_python_module(Image)
     if((DEFINED PY_RSVG) AND (DEFINED PY_IMAGE))
-        set(BUILD_RESOURCE_DAT ON)
+        set(CAN_BUILD_RESOURCE_DAT ON)
     endif((DEFINED PY_RSVG) AND (DEFINED PY_IMAGE))
 endif(PYTHONINTERP_FOUND)
 
-add_subdirectory(external)
-
 set(plClient_HEADERS
     plClient.h
     plClientCreatable.h
@@ -63,9 +61,10 @@ set(plClient_RESOURCES
 add_executable(plClient WIN32 ${plClient_SOURCES} ${plClient_HEADERS}
                               ${plClient_TEXT} ${plClient_RESOURCES})
 
-if(BUILD_RESOURCE_DAT)
+if(CAN_BUILD_RESOURCE_DAT AND PLASMA_BUILD_RESOURCE_DAT)
+    add_subdirectory(external)
     add_dependencies(plClient externalResources)
-endif(BUILD_RESOURCE_DAT)
+endif()
 
 if(PLASMA_EXTERNAL_RELEASE)
     set_target_properties(plClient PROPERTIES OUTPUT_NAME "UruExplorer")

Sources/Tools/CMakeLists.txt

@@ -1,9 +1,10 @@
-add_subdirectory(plLocalizationEditor)
-add_subdirectory(plResBrowser)
-add_subdirectory(plShaderAssembler)
-
-if(FREETYPE_FOUND)
-    add_subdirectory(plFontConverter)
+if(PLASMA_BUILD_TOOLS)
+    add_subdirectory(plLocalizationEditor)
+    add_subdirectory(plResBrowser)
+    add_subdirectory(plShaderAssembler)
+    if(FREETYPE_FOUND)
+        add_subdirectory(plFontConverter)
+    endif()
 endif()
 
 # Max Stuff goes below here...