Merge branch 'northivanastan/documentation' into 'master'

[xonotic/xonotic.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e63f71f6654983d9ed0195700ec4070da685694f..23080598b53504e61e954830ad56295dc97b3c7f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,12 @@ function(subproject id name)
     endif ()
 endfunction()
 
     endif ()
 endfunction()
 

-subproject(DAEMON daemon)

 subproject(PKI d0_blind_id)
 subproject(PKI d0_blind_id)

+subproject(DAEMON daemon)

 subproject(DP darkplaces)
 subproject(DP darkplaces)

-subproject(DATA data/xonotic-data.pk3dir)

 subproject(QCC gmqcc)
 subproject(RADIANT netradiant)
 subproject(QCC gmqcc)
 subproject(RADIANT netradiant)

+subproject(DATA data/xonotic-data.pk3dir)

 
 if (DOWNLOAD_MAPS)
     add_custom_target(update-maps ALL
 
 if (DOWNLOAD_MAPS)
     add_custom_target(update-maps ALL