X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=b2fa296e953cd9c6c2fcfec248b5a3afd8bd3ab1;hb=f8783749e760415506b4889ee7a970e876d0cb49;hp=7e083638b63c6099553b74af7d8fd66dcf7591d8;hpb=41d1f1587bc636a5a23f77ab9ae80a6f52a6dbab;p=xonotic%2Fnetradiant.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e083638..b2fa296e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,15 @@ 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") +if (EXISTS "${BUILTINS_PKGCONFIG_DIR}gtkglext-1.0.pc") set(BUILTIN_GTKGLEXT_BUILT ON) endif () @@ -71,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() @@ -99,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 "...") @@ -221,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 () @@ -239,6 +251,8 @@ if (BUILD_RADIANT) if (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 () @@ -334,20 +348,34 @@ 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) + set(GTKGLEXT_PKGNAMES "gdk-2.0 gtk+-2.0 glib-2.0") - execute_process(COMMAND pkg-config --libs gdk-2.0 gtk+-2.0 glib-2.0 gl + if (NOT APPLE) + set(GTKGLEXT_PKGNAMES "${GTKGLEXT_PKGNAMES} gl") + endif () + + execute_process(COMMAND pkg-config --libs ${GTKGLEXT_PKGNAMES} OUTPUT_VARIABLE GTKGLEXT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ) + set(GTKGLEXT_LDFLAGS "$ENV{LDFLAGS} -lm ${GTKGLEXT_LDFLAGS}") + execute_process(COMMAND pkg-config --cflags ${GTKGLEXT_PKGNAMES} + OUTPUT_VARIABLE GTKGLEXT_CFLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + set(GTKGLEXT_CFLAGS "$ENV{CFLAGS} ${GTKGLEXT_CFLAGS}") + if (NOT CMAKE_BUILD_TYPE MATCHES Release) - set(GTKGLEXT_CFLAGS "$ENV{CFLAGS} -g") - else () - set(GTKGLEXT_CFLAGS "$ENV{CFLAGS}") - endif() + set(GTKGLEXT_CFLAGS "${GTKGLEXT_CFLAGS} -g") + endif () set(CONFIGURE_OPTIONS --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf) @@ -357,28 +385,55 @@ if (BUILTIN_GTKGLEXT) set(GTKGLEXT_GIT_TAG fixes) endif () + if (APPLE) + set(GTKGLEXT_CFLAGS "${GTKGLEXT_CFLAGS} -DGL_SILENCE_DEPRECATION=1") + # FIXME: OpenGL deprecation warnings are not silenced + # in Objective C code. + 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 LDFLAGS=${GTKGLEXT_LDFLAGS} - CONFIGURE_COMMAND && NOCONFIGURE=1 ./autogen.sh + CONFIGURE_COMMAND export CFLAGS=${GTKGLEXT_LDFLAGS} + CONFIGURE_COMMAND && export LDFLAGS=${GTKGLEXT_CFLAGS} + CONFIGURE_COMMAND && export NOCONFIGURE=1 + CONFIGURE_COMMAND && ./autogen.sh CONFIGURE_COMMAND && ./configure --prefix "${BUILTINS_INSTALL_DIR}" ${CONFIGURE_OPTIONS} - BUILD_COMMAND $(MAKE) CFLAGS=${GTKGLEXT_CFLAGS} LDFLAGS=${GTKGLEXT_LDFLAGS} + BUILD_COMMAND $(MAKE) + 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) 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 + 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 +563,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 ()