X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=CMakeLists.txt;h=fe345ca4e02d58cf0f78352af044c5b2caac6e10;hb=e613901091652722a5de1f5f0d5a24c1ebbdfa9c;hp=d3f8b284d15e190e1904864526a65a1397eb3801;hpb=b1c9cf4434f0d6352924b871438112799a9850ef;p=xonotic%2Fnetradiant.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3f8b284..fe345ca4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ if (APPLE)
 endif ()
 
 set(BUILTIN_GTKGLEXT_BUILT OFF CACHE INTERNAL "...")
-if (EXISTS "${BUILTINS_INSTALL_DIR}/lib/pkgconfig/gtkglext-1.0.pc")
+if (EXISTS "${BUILTINS_PKGCONFIG_DIR}/gtkglext-1.0.pc")
     set(BUILTIN_GTKGLEXT_BUILT ON)
 endif ()
 
@@ -373,11 +373,12 @@ if (BUILTIN_GTKGLEXT)
 
     set(GTKGLEXT_CFLAGS "$ENV{CFLAGS} ${GTKGLEXT_CFLAGS}")
 
-    if (NOT CMAKE_BUILD_TYPE MATCHES Release)
-        set(GTKGLEXT_CFLAGS "${GTKGLEXT_CFLAGS} -g")
-    endif ()
 
-    set(CONFIGURE_OPTIONS --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf)
+    set(CONFIGURE_OPTIONS --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-dependency-tracking --without-x)
+
+    if (CMAKE_BUILD_TYPE MATCHES Release)
+        set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} --disable-debug)
+    endif ()
 
     if (APPLE)
         set(GTKGLEXT_GIT_TAG macos)
@@ -386,29 +387,26 @@ if (BUILTIN_GTKGLEXT)
     endif ()
 
     if (APPLE)
-        set(GTKGLEXT_CFLAGS "${GTKGLEXT_CFLAGS} -DGL_SILENCE_DEPRECATION=1")
-        set(OBJC "${OBJC} -DGL_SILENCE_DEPRECATION=1")
+        set(GTKGLEXT_CFLAGS "${GTKGLEXT_CFLAGS} -DGL_SILENCE_DEPRECATION=1 -Wno-deprecated-declarations")
     endif ()
 
     ExternalProject_Add(gtkglext
         GIT_REPOSITORY https://gitlab.gnome.org/illwieckz/gtkglext.git
         GIT_TAG ${GTKGLEXT_GIT_TAG}
         BUILD_IN_SOURCE ON
-        CONFIGURE_COMMAND export CC=${CMAKE_C_COMPILER}
-        CONFIGURE_COMMAND && export CFLAGS=${GTKGLEXT_LDFLAGS}
-        CONFIGURE_COMMAND && export LDFLAGS=${GTKGLEXT_CFLAGS}
+        CONFIGURE_COMMAND export CCFLAGS=${GTKGLEXT_CFLAGS}
+        CONFIGURE_COMMAND && export LDFLAGS=${GTKGLEXT_LDFLAGS}
         CONFIGURE_COMMAND && export NOCONFIGURE=1
         CONFIGURE_COMMAND && ./autogen.sh
         CONFIGURE_COMMAND && ./configure --prefix "${BUILTINS_INSTALL_DIR}" ${CONFIGURE_OPTIONS}
         BUILD_COMMAND $(MAKE)
-        BUILD_COMMAND CC=${CMAKE_C_COMPILER}
         BUILD_COMMAND CFLAGS=${GTKGLEXT_CFLAGS}
         BUILD_COMMAND LDFLAGS=${GTKGLEXT_LDFLAGS}
         INSTALL_COMMAND $(MAKE) install
     )
 
-    include_directories("${BUILTINS_INSTALL_DIR}/lib/gtkglext-1.0/include")
-    include_directories("${BUILTINS_INSTALL_DIR}/include/gtkglext-1.0")
+    include_directories("${BUILTINS_INCLUDE_DIR}/gtkglext-1.0")
+    include_directories("${BUILTINS_LIB_DIR}/gtkglext-1.0/include")
 
     add_dependencies(builtins gtkglext)
     set_target_properties(gtkglext PROPERTIES EXCLUDE_FROM_ALL ON)