X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=9159a9803347e42b73364f3f92b73cab1058f3ab;hb=7ba473e5f11c73b920eb7abd9ce69d03f77ce90c;hp=7e083638b63c6099553b74af7d8fd66dcf7591d8;hpb=41d1f1587bc636a5a23f77ab9ae80a6f52a6dbab;p=xonotic%2Fnetradiant.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e083638..9159a980 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,12 @@ set(BUILTINS_LIB_DIR "${BUILTINS_INSTALL_DIR}/lib")
 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 (APPLE)
+    set(BUILTIN_GTKGLEXT ON)
+    set(BUILTIN_GTKTHEME_MOJAVE ON)
+endif ()
 
 set(BUILTIN_GTKGLEXT_BUILT OFF CACHE INTERNAL "...")
 if (EXISTS "${BUILTINS_INSTALL_DIR}/lib/pkgconfig/gtkglext-1.0.pc")
@@ -99,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 "...")
@@ -239,6 +245,7 @@ if (BUILD_RADIANT)
     if (APPLE)
         if (GTK_TARGET EQUAL 2)
             add_definitions(-DWORKAROUND_MACOS_GTK2_DESTROY=1)
+            add_definitions(-DWORKAROUND_MACOS_GTK2_GLWIDGET=1)
         endif ()
     endif ()
 endif ()
@@ -334,9 +341,11 @@ endif ()
 
 add_custom_target(builtins)
 
-if (BUILTIN_GTKGLEXT)
+if (BUILTIN_GTKGLEXT OR BUILTIN_GTKTHEME_MOJAVE)
     include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+endif ()
 
+if (BUILTIN_GTKGLEXT)
     execute_process(COMMAND pkg-config --libs gdk-2.0 gtk+-2.0 glib-2.0 gl
         OUTPUT_VARIABLE GTKGLEXT_LDFLAGS
         OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -344,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)
 
@@ -364,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
     )
 
@@ -379,6 +389,19 @@ if (BUNDLE_LIBRARIES AND EXISTS ${BUILTINS_LIB_DIR})
     set(CMAKE_SKIP_BUILD_RPATH ON)
 endif()
 
+if (BUILTIN_GTKTHEME_MOJAVE)
+    ExternalProject_Add(gtktheme-mojave
+        GIT_REPOSITORY https://github.com/vinceliuice/Mojave-gtk-theme.git
+        GIT_TAG master
+        BUILD_IN_SOURCE ON
+        CONFIGURE_COMMAND echo
+        BUILD_COMMAND echo
+        INSTALL_COMMAND ./install.sh -o standard -a standard -s standard -i standard -d "${PROJECT_BINARY_DIR}/themes"
+    )
+    add_dependencies(builtins gtktheme-mojave)
+    set_target_properties(gtktheme-mojave PROPERTIES EXCLUDE_FROM_ALL ON)
+endif ()
+
 #-----------------------------------------------------------------------
 # Libraries
 #-----------------------------------------------------------------------
@@ -508,11 +531,15 @@ endif ()
 
 if (APPLE)
     install(DIRECTORY
-        setup/apple/Contents
+        setup/macos/Contents
         DESTINATION ${APPLE_INSTALL_PREFIX}
     )
+    install(DIRECTORY
+    ${PROJECT_BINARY_DIR}/themes
+        DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/Prefix/share
+    )
     install(PROGRAMS
-        setup/apple/netradiant
+        setup/macos/NetRadiant
         DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/MacOS
     )
 endif ()