submodules: sync daemonmap reference

[xonotic/netradiant.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b01730e8fcd1690b2d081fefb019385719e6d542..cfef0a021a2f9ff338c89a4d5fbf93ec8669405c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ option(BUILTIN_GTKGLEXT "Builtin GtkGLExt" OFF)
 option(BUILTIN_GTKTHEME_MOJAVE "Builtin Mojave GTK theme" OFF)
 
 if (APPLE)
-       set(BUILTIN_GTKGLEXT ON)
-       set(BUILTIN_GTKTHEME_MOJAVE ON)
+    set(BUILTIN_GTKGLEXT ON)
+    set(BUILTIN_GTKTHEME_MOJAVE ON)
 endif ()
 
 set(BUILTIN_GTKGLEXT_BUILT OFF CACHE INTERNAL "...")
@@ -77,7 +77,9 @@ if (BUILD_RADIANT OR BUILD_TOOLS)
 endif ()
 
 if (BUILD_BINARIES)
-    if (WIN32 OR APPLE OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+    if (WIN32 OR APPLE
+        OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux"
+        OR "${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD" )
         set(BUNDLING_SUPPORTED ON)
     endif()
 
@@ -105,10 +107,10 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 endif ()
 
 if (APPLE)
-       set(APPLE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/NetRadiant.app)
-       set(FINAL_INSTALL_PREFIX ${APPLE_INSTALL_PREFIX}/Contents/Prefix)
+    set(APPLE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/NetRadiant.app)
+    set(FINAL_INSTALL_PREFIX ${APPLE_INSTALL_PREFIX}/Contents/Prefix)
 else ()
-       set(FINAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+    set(FINAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 endif ()
 
 set(RADIANT_NAME "NetRadiant" CACHE INTERNAL "...")
@@ -227,6 +229,10 @@ if (BUILD_BINARIES)
     addflags("-Wno-unused-variable")
     addflags("-Wno-unused-parameter")
 
+    if (APPLE)
+        add_definitions(-DGL_SILENCE_DEPRECATION=1)
+    endif()
+
     set(CMAKE_POSITION_INDEPENDENT_CODE 1)
 endif ()
 
@@ -353,15 +359,16 @@ if (BUILTIN_GTKGLEXT)
     set(GTKGLEXT_LDFLAGS "$ENV{LDFLAGS} -lm ${GTKGLEXT_LDFLAGS}")
 
     if (NOT CMAKE_BUILD_TYPE MATCHES Release)
-               set(GTKGLEXT_CFLAGS "$ENV{CFLAGS} -g")
-       else ()
-               set(GTKGLEXT_CFLAGS "$ENV{CFLAGS}")
-       endif()
+        set(GTKGLEXT_CFLAGS "$ENV{CFLAGS} -g")
+    else ()
+        set(GTKGLEXT_CFLAGS "$ENV{CFLAGS}")
+    endif()
 
     set(CONFIGURE_OPTIONS --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf)
 
     if (APPLE)
         set(GTKGLEXT_GIT_TAG macos)
+        set(GTKGLEXT_CFLAGS "${GTKGLEXT_CFLAGS} -DGL_SILENCE_DEPRECATION=1")
     else ()
         set(GTKGLEXT_GIT_TAG fixes)
     endif ()
@@ -384,12 +391,16 @@ if (BUILTIN_GTKGLEXT)
     set_target_properties(gtkglext PROPERTIES EXCLUDE_FROM_ALL ON)
 endif ()
 
-if (BUNDLE_LIBRARIES AND EXISTS ${BUILTINS_LIB_DIR})
-    set(CMAKE_SKIP_BUILD_RPATH ON)
+if (BUNDLE_LIBRARIES)
+    # It was required to tell cmake to not patch rpath on macos builtins.
+    # It was also required to tell cmake to not patch rpath on freebsd binaries.
+    # Patching rpath is done in library_bundler instead so we can skip this
+    # step entirely when bundling.
+    set(CMAKE_SKIP_RPATH ON)
 endif()
 
 if (BUILTIN_GTKTHEME_MOJAVE)
-       ExternalProject_Add(gtktheme-mojave
+    ExternalProject_Add(gtktheme-mojave
         GIT_REPOSITORY https://github.com/vinceliuice/Mojave-gtk-theme.git
         GIT_TAG master
         BUILD_IN_SOURCE ON