Fix map autoscreenshot script taking all screenshots from the same position, and...

[xonotic/xonotic.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 704c5439928969b2c35a55699fa1a47fe275bddd..23080598b53504e61e954830ad56295dc97b3c7f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,21 +1,24 @@
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 project(xonotic)
 
 option(DOWNLOAD_MAPS "Download new maps from the build server" ON)
 option(BUILD_RELEASE "Package a release" OFF)
 
-macro(subproject id name)
-    if (EXISTS "${PROJECT_SOURCE_DIR}/${name}/CMakeLists.txt" AND NOT DEFINED ENV{XON_NO_${id}})
+function(subproject id name)
+    if ($ENV{XON_NO_${id}})
+        return()
+    endif ()
+    if (EXISTS "${PROJECT_SOURCE_DIR}/${name}/CMakeLists.txt")
         add_subdirectory(${name} ${ARGN})
     endif ()
-endmacro()
+endfunction()
 
-subproject(DAEMON  daemon)
-subproject(PKI     d0_blind_id)
-subproject(DP      darkplaces)
-subproject(DATA    data/xonotic-data.pk3dir)
-subproject(QCC     gmqcc)
+subproject(PKI d0_blind_id)
+subproject(DAEMON daemon)
+subproject(DP darkplaces)
+subproject(QCC gmqcc)
 subproject(RADIANT netradiant)
+subproject(DATA data/xonotic-data.pk3dir)
 
 if (DOWNLOAD_MAPS)
     add_custom_target(update-maps ALL