radiant/vfs: rework vfs loading, attempt to load wads and paks, ref #139

[xonotic/netradiant.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfc6fc70ad020e09f9704ebb0ae8637eb5d47fb5..c6cc4464a3dfb724ecb81eaf7a8f43b41535793d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,9 +2,22 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 project(NetRadiant C CXX)
 
+if (EXISTS "${PROJECT_SOURCE_DIR}/libs/crunch/inc/crn_decomp.h")
+    set(DEFAULT_BUILD_CRUNCH ON CACHE INTERNAL "...")
+else ()
+    set(DEFAULT_BUILD_CRUNCH OFF CACHE INTERNAL "...")
+endif ()
+
+if (EXISTS "${PROJECT_SOURCE_DIR}/tools/unvanquished/daemonmap/tools/quake3/q3map2/main.c")
+    set(DEFAULT_BUILD_DAEMONMAP ON CACHE INTERNAL "...")
+else ()
+    set(DEFAULT_BUILD_DAEMONMAP OFF CACHE INTERNAL "...")
+endif ()
+
 option(BUILD_RADIANT "Build the GUI" ON)
 option(BUILD_TOOLS "Build the tools" ON)
-option(BUILD_CRUNCH "Build Crunch image support" OFF)
+option(BUILD_CRUNCH "Build Crunch image support" ${DEFAULT_BUILD_CRUNCH})
+option(BUILD_DAEMONMAP "Build daemonmap navigation mesh generator" ${DEFAULT_BUILD_DAEMONMAP})
 option(DOWNLOAD_GAMEPACKS "Download game packs" ON)
 option(USE_WERROR "Build with -Werror -pedantic-errors" OFF)
 option(FHS_INSTALL "Install according to Filesystem Hierarchy Standard" OFF)
@@ -276,20 +289,14 @@ endif ()
 #-----------------------------------------------------------------------
 
 if (BUILD_BINARIES)
-    if (CMAKE_EXECUTABLE_SUFFIX)
-        string(REGEX REPLACE "^[.]" "" RADIANT_EXECUTABLE ${CMAKE_EXECUTABLE_SUFFIX})
-    endif ()
-
     macro (radiant_tool name)
         add_dependencies(binaries ${name})
 
-        if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED)
-            if (WIN32)
-                add_executable(${name} ${ARGN} ${PROJECT_SOURCE_DIR}/include/lib.rc)
-            else ()
-                add_executable(${name} ${ARGN})
-            endif()
-        endif ()
+        if (WIN32)
+            add_executable(${name} ${ARGN} ${PROJECT_SOURCE_DIR}/include/lib.rc)
+        else ()
+            add_executable(${name} ${ARGN})
+        endif()
 
         copy_dlls(${name})
 
@@ -301,9 +308,6 @@ if (BUILD_BINARIES)
 
     if (BUILD_RADIANT)
         add_subdirectory(radiant)
-        set_target_properties(${RADIANT_BASENAME} PROPERTIES
-        COMPILE_DEFINITIONS RADIANT_EXECUTABLE="${RADIANT_EXECUTABLE}"
-    )
     endif ()
 endif ()
 
@@ -350,6 +354,11 @@ if (BUILD_BINARIES)
         docs
         DESTINATION ${RADIANT_DATA_DIR}
     )
+
+    install(FILES
+        setup/data/tools/global.xlink
+        DESTINATION ${RADIANT_DATA_DIR}
+    )
 endif ()
 
 if (DOWNLOAD_GAMEPACKS)