X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=CMakeLists.txt;h=7a04403144f9618dd01d9dcf408aff56403847d6;hp=29743727a9579ac8539e8cd20a216088ed4eedb1;hb=6f4e73fa585738042b3752d334e76efda58e9771;hpb=51f57c17f538d299fb6bdba3b1b5d71e630664b0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 29743727..7a044031 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") @@ -70,6 +76,28 @@ if (BUILD_RADIANT OR BUILD_TOOLS) set(BUILD_BINARIES ON) endif () +if (BUILD_BINARIES) + if (WIN32 OR APPLE + OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" + OR "${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD" ) + set(BUNDLING_SUPPORTED ON) + endif() + + if (BUNDLING_SUPPORTED) + if(WIN32 AND NOT CMAKE_CROSSCOMPILING) + set(BUNDLE_LIBRARIES_DEFAULT ON) + else () + set(BUNDLE_LIBRARIES_DEFAULT OFF) + endif () + + option(BUNDLE_LIBRARIES "Bundle libraries" ${BUNDLE_LIBRARIES_DEFAULT}) + endif () + + if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED) + set(FHS_INSTALL OFF CACHE PATH "Disabled because of BUNDLE_LIBRARIES" FORCE) + endif () +endif () + #----------------------------------------------------------------------- # Paths #----------------------------------------------------------------------- @@ -78,19 +106,32 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/install" CACHE PATH "..." FORCE) endif () +if (APPLE) + 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}) +endif () + set(RADIANT_NAME "NetRadiant" CACHE INTERNAL "...") add_definitions(-DRADIANT_NAME="${RADIANT_NAME}") set(RADIANT_BASENAME "netradiant" CACHE INTERNAL "...") add_definitions(-DRADIANT_BASENAME="${RADIANT_BASENAME}") -set(RADIANT_LIB_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...") -set(RADIANT_BIN_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...") -set(RADIANT_DATA_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...") +set(RADIANT_BIN_DIR ${FINAL_INSTALL_PREFIX} CACHE INTERNAL "...") +set(RADIANT_LIB_DIR ${FINAL_INSTALL_PREFIX}/lib CACHE INTERNAL "...") +set(RADIANT_ADDONS_DIR ${FINAL_INSTALL_PREFIX} CACHE INTERNAL "...") +set(RADIANT_ETC_DIR ${FINAL_INSTALL_PREFIX}/etc CACHE INTERNAL "...") +set(RADIANT_SHARE_DIR ${FINAL_INSTALL_PREFIX}/share CACHE INTERNAL "...") +set(RADIANT_DATA_DIR ${FINAL_INSTALL_PREFIX} CACHE INTERNAL "...") if (FHS_INSTALL AND NOT BUNDLE_LIBRARIES) - set(RADIANT_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/${RADIANT_BASENAME}) - set(RADIANT_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin) - set(RADIANT_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${RADIANT_BASENAME}) + set(RADIANT_BIN_DIR ${FINAL_INSTALL_PREFIX}/bin) + set(RADIANT_LIB_DIR ${FINAL_INSTALL_PREFIX}/lib) + set(RADIANT_ADDONS_DIR ${RADIANT_LIB_DIR}/${RADIANT_BASENAME}) + set(RADIANT_ETC_DIR ${FINAL_INSTALL_PREFIX}/etc) + set(RADIANT_SHARE_DIR ${FINAL_INSTALL_PREFIX}/share) + set(RADIANT_DATA_DIR ${RADIANT_SHARE_DIR}/${RADIANT_BASENAME}) endif () set(GAMEPACKS_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/download CACHE PATH "Where to store downloaded game packs") @@ -188,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 () @@ -202,6 +247,14 @@ if (BUILD_RADIANT) add_definitions(-DWORKAROUND_WINDOWS_GTK2_GLWIDGET=1) endif () endif () + + 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 () #----------------------------------------------------------------------- @@ -267,26 +320,6 @@ if (BUILD_BINARIES) include_directories("${PROJECT_SOURCE_DIR}/include") include_directories("${PROJECT_SOURCE_DIR}/libs") - if (WIN32 OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - set(BUNDLING_SUPPORTED ON) - endif() - - if (BUNDLING_SUPPORTED) - if(WIN32 AND NOT CMAKE_CROSSCOMPILING) - set(BUNDLE_LIBRARIES_DEFAULT ON) - else () - set(BUNDLE_LIBRARIES_DEFAULT OFF) - endif () - - option(BUNDLE_LIBRARIES "Bundle libraries" ${BUNDLE_LIBRARIES_DEFAULT}) - endif () - - if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED) - add_subdirectory(bundle) - - set(FHS_INSTALL OFF CACHE PATH "Disabled because of BUNDLE_LIBRARIES" FORCE) - endif () - macro (copy_dlls target) if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED) add_custom_command(TARGET ${target} POST_BUILD @@ -299,39 +332,82 @@ if (BUILD_BINARIES) endmacro () endif () +#----------------------------------------------------------------------- +# Bundle +#----------------------------------------------------------------------- + +if (BUILD_BINARIES) + if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED) + add_subdirectory(bundle) + endif () +endif () + #----------------------------------------------------------------------- # Builtins: targets #----------------------------------------------------------------------- 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 - OUTPUT_VARIABLE GTKGLEXT_DEPS_LDFLAGS + 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_DEPS_LDFLAGS "-lm ${GTKGLEXT_DEPS_LDFLAGS}") + + 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 "${GTKGLEXT_CFLAGS} -g") + endif () + + set(CONFIGURE_OPTIONS --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf) + + if (APPLE) + set(GTKGLEXT_GIT_TAG macos) + else () + 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 fixes + GIT_TAG ${GTKGLEXT_GIT_TAG} BUILD_IN_SOURCE ON - CONFIGURE_COMMAND NOCONFIGURE=1 ./autogen.sh - CONFIGURE_COMMAND && ./configure --prefix "${BUILTINS_INSTALL_DIR}" --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf - BUILD_COMMAND $(MAKE) LDFLAGS=${GTKGLEXT_DEPS_LDFLAGS} + CONFIGURE_COMMAND export CC=${CMAKE_C_COMPILER} + 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) + BUILD_COMMAND CC=${CMAKE_C_COMPILER} + BUILD_COMMAND CFLAGS=${GTKGLEXT_CFLAGS} + BUILD_COMMAND LDFLAGS=${GTKGLEXT_LDFLAGS} INSTALL_COMMAND $(MAKE) install ) -# set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_PATH}:${BUILTINS_INSTALL_DIR}lib/pkgconfig/) -# execute_process(COMMAND pkg-config --libs gtkglext-1.0 -# OUTPUT_VARIABLE GTKGLEXT_LDFLAGS -# OUTPUT_STRIP_TRAILING_WHITESPACE -# ) -# set(CMAKE_EXE_LINKER_FLAGS ${GTKGLEXT_LDFLAGS}) - -# list(APPEND CMAKE_PREFIX_PATH "${BUILTINS_INSTALL_DIR}") include_directories("${BUILTINS_INSTALL_DIR}/lib/gtkglext-1.0/include") include_directories("${BUILTINS_INSTALL_DIR}/include/gtkglext-1.0") @@ -339,10 +415,27 @@ 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 + 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 #----------------------------------------------------------------------- @@ -449,30 +542,39 @@ if (BUILD_BINARIES) endif () if (DOWNLOAD_GAMEPACKS) - if (FHS_INSTALL) - set(GAME_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share/netradiant") - else () - set(GAME_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - endif () - install(DIRECTORY ${PROJECT_BINARY_DIR}/gamepacks DESTINATION ${RADIANT_DATA_DIR} ) endif () -if(BUILD_BINARIES AND FHS_INSTALL AND NOT WIN32 AND NOT APPLE) +if (BUILD_BINARIES AND FHS_INSTALL AND NOT WIN32 AND NOT APPLE) install(FILES - ${PROJECT_SOURCE_DIR}/icons/netradiant.png - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps + icons/netradiant.png + DESTINATION ${RADIANT_SHARE_DIR}/pixmaps ) install(FILES - ${PROJECT_SOURCE_DIR}/icons/netradiant.desktop - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications + icons/netradiant.desktop + DESTINATION ${RADIANT_SHARE_DIR}/applications ) install(FILES - ${PROJECT_SOURCE_DIR}/icons/mime/map.xml - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mime/model + icons/mime/map.xml + DESTINATION ${RADIANT_SHARE_DIR}/mime/model + ) +endif () + +if (APPLE) + install(DIRECTORY + setup/macos/Contents + DESTINATION ${APPLE_INSTALL_PREFIX} + ) + install(DIRECTORY + ${PROJECT_BINARY_DIR}/themes + DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/Prefix/share + ) + install(PROGRAMS + setup/macos/NetRadiant + DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/MacOS ) endif ()