X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=CMakeLists.txt;h=839813ea8733e22f05b75fde4b96ec0b3486ed07;hb=c13ca32e8f91c0d7a12041a977e7f61965b64b38;hp=c2d795c846fde527ec8b323aef6d935047668b02;hpb=73d44588f5a08518740d5cda1040dd755a1c360e;p=xonotic%2Fnetradiant.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2d795c8..839813ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,10 @@ set(BUILTINS_PKGCONFIG_DIR "${BUILTINS_INSTALL_DIR}/lib/pkgconfig")
 option(BUILTIN_GTKGLEXT "Builtin GtkGLExt" OFF)
 option(BUILTIN_GTKTHEME_MOJAVE "Builtin Mojave GTK theme" OFF)
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
 if (APPLE)
     set(BUILTIN_GTKGLEXT ON)
     set(BUILTIN_GTKTHEME_MOJAVE ON)
@@ -53,12 +57,6 @@ 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 ()
-
 #-----------------------------------------------------------------------
 # Build options
 #-----------------------------------------------------------------------
@@ -66,7 +64,6 @@ endif ()
 option(BUILD_RADIANT "Build the GUI" ON)
 option(BUILD_TOOLS "Build the tools" ON)
 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)
@@ -263,15 +260,13 @@ if (BUILD_RADIANT)
         if (GTK_TARGET EQUAL 2)
             add_definitions(-DWORKAROUND_WINDOWS_GTK2_GLWIDGET=1)
         endif ()
-    endif ()
-
-    if (APPLE)
+    elseif (APPLE)
         if (GTK_TARGET EQUAL 2)
             add_definitions(-DWORKAROUND_MACOS_GTK2_DESTROY=1)
             add_definitions(-DWORKAROUND_MACOS_GTK2_GLWIDGET=1)
             add_definitions(-DWORKAROUND_MACOS_GTK2_LAGGYPOINTER=1)
         endif ()
-    endif ()
+    endif()
 endif ()
 
 #-----------------------------------------------------------------------