q3map2: accept -bsp stage option name without complaining

[xonotic/netradiant.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94136b8c870eb2c78ef6bf65cec76533c9b5a6e4..9159a9803347e42b73364f3f92b73cab1058f3ab 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 "...")
@@ -105,10 +105,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 "...")
@@ -353,10 +353,10 @@ 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)
 
@@ -373,7 +373,8 @@ if (BUILTIN_GTKGLEXT)
         CONFIGURE_COMMAND export LDFLAGS=${GTKGLEXT_LDFLAGS}
         CONFIGURE_COMMAND && NOCONFIGURE=1 ./autogen.sh
         CONFIGURE_COMMAND && ./configure --prefix "${BUILTINS_INSTALL_DIR}" ${CONFIGURE_OPTIONS}
-        BUILD_COMMAND $(MAKE) CFLAGS=${GTKGLEXT_CFLAGS} LDFLAGS=${GTKGLEXT_LDFLAGS}
+        BUILD_COMMAND GL_SILENCE_DEPRECATION=1
+        BUILD_COMMAND && $(MAKE) CFLAGS=${GTKGLEXT_CFLAGS} LDFLAGS=${GTKGLEXT_LDFLAGS}
         INSTALL_COMMAND $(MAKE) install
     )
 
@@ -389,7 +390,7 @@ if (BUNDLE_LIBRARIES AND EXISTS ${BUILTINS_LIB_DIR})
 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
@@ -530,7 +531,7 @@ endif ()
 
 if (APPLE)
     install(DIRECTORY
-        setup/apple/Contents
+        setup/macos/Contents
         DESTINATION ${APPLE_INSTALL_PREFIX}
     )
     install(DIRECTORY
@@ -538,7 +539,7 @@ if (APPLE)
         DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/Prefix/share
     )
     install(PROGRAMS
-        setup/apple/netradiant
+        setup/macos/NetRadiant
         DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/MacOS
     )
 endif ()