]> de.git.xonotic.org Git - xonotic/netradiant.git/blobdiff - CMakeLists.txt
cmake: OBJC is not passed to gtkglext build tools
[xonotic/netradiant.git] / CMakeLists.txt
index a20042217319d8d4b1e817efa5914a928cadf06f..7a04403144f9618dd01d9dcf408aff56403847d6 100644 (file)
@@ -1,10 +1,72 @@
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
 project(NetRadiant C CXX)
 
+#-----------------------------------------------------------------------
+# Builtins: configuration
+#-----------------------------------------------------------------------
+
+set(BUILTINS_INSTALL_DIR "${CMAKE_BINARY_DIR}/builtins")
+set(BUILTINS_INCLUDE_DIR "${BUILTINS_INSTALL_DIR}/include")
+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")
+    set(BUILTIN_GTKGLEXT_BUILT ON)
+endif ()
+
+if (EXISTS "${BUILTINS_INCLUDE_DIR}")
+    include_directories("${BUILTINS_INCLUDE_DIR}")
+endif ()
+
+if (EXISTS "${BUILTINS_LIB_DIR}")
+    set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${BUILTINS_LIB_DIR}")
+    link_directories("${BUILTINS_LIB_DIR}")
+endif ()
+
+if (EXISTS "${BUILTINS_PKGCONFIG_DIR}")
+    set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${BUILTINS_PKGCONFIG_DIR}")
+endif ()
+
+#-----------------------------------------------------------------------
+# CMake modules
+#-----------------------------------------------------------------------
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+
+#-----------------------------------------------------------------------
+# Submodules
+#-----------------------------------------------------------------------
+
+if (EXISTS "${PROJECT_SOURCE_DIR}/libs/crunch/inc/crn_decomp.h")
+    set(DEFAULT_BUILD_CRUNCH ON CACHE INTERNAL "...")
+else ()
+    set(DEFAULT_BUILD_CRUNCH OFF CACHE INTERNAL "...")
+endif ()
+
+if (EXISTS "${PROJECT_SOURCE_DIR}/tools/unvanquished/daemonmap/tools/quake3/q3map2/main.c")
+    set(DEFAULT_BUILD_DAEMONMAP ON CACHE INTERNAL "...")
+else ()
+    set(DEFAULT_BUILD_DAEMONMAP OFF CACHE INTERNAL "...")
+endif ()
+
+#-----------------------------------------------------------------------
+# Build options
+#-----------------------------------------------------------------------
+
 option(BUILD_RADIANT "Build the GUI" ON)
 option(BUILD_TOOLS "Build the tools" ON)
-option(BUILD_CRUNCH "Build Crunch image support" OFF)
+option(BUILD_CRUNCH "Build Crunch image support" ${DEFAULT_BUILD_CRUNCH})
+option(BUILD_DAEMONMAP "Build daemonmap navigation mesh generator" ${DEFAULT_BUILD_DAEMONMAP})
 option(DOWNLOAD_GAMEPACKS "Download game packs" ON)
 option(USE_WERROR "Build with -Werror -pedantic-errors" OFF)
 option(FHS_INSTALL "Install according to Filesystem Hierarchy Standard" OFF)
@@ -14,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
 #-----------------------------------------------------------------------
@@ -22,41 +106,58 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/install" CACHE PATH "..." FORCE)
 endif ()
 
-set(RADIANT_BASENAME netradiant CACHE INTERNAL "...")
-add_definitions(-DRADIANT_BASENAME="${RADIANT_BASENAME}")
+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_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_NAME "NetRadiant" CACHE INTERNAL "...")
+add_definitions(-DRADIANT_NAME="${RADIANT_NAME}")
+set(RADIANT_BASENAME "netradiant" CACHE INTERNAL "...")
+add_definitions(-DRADIANT_BASENAME="${RADIANT_BASENAME}")
 
-if (FHS_INSTALL)
-    set(RADIANT_LIB_DIR lib/${RADIANT_BASENAME})
-    set(RADIANT_BIN_DIR bin)
-    set(RADIANT_DATA_DIR share/${RADIANT_BASENAME})
+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_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")
+
 #-----------------------------------------------------------------------
 # Version
 #-----------------------------------------------------------------------
 
 # CMake 3.0+ would allow this in project()
-set(NetRadiant_VERSION_MAJOR 1)
-set(NetRadiant_VERSION_MINOR 5)
-set(NetRadiant_VERSION_PATCH 0)
-set(NetRadiant_VERSION "${NetRadiant_VERSION_MAJOR}.${NetRadiant_VERSION_MINOR}.${NetRadiant_VERSION_PATCH}")
+set(RADIANT_VERSION_MAJOR 1)
+set(RADIANT_VERSION_MINOR 5)
+set(RADIANT_VERSION_PATCH 0)
+set(RADIANT_VERSION "${RADIANT_VERSION_MAJOR}.${RADIANT_VERSION_MINOR}.${RADIANT_VERSION_PATCH}")
 
 set(RADIANT_ABOUTMSG "Custom build" CACHE STRING "About message")
 
 find_package(Git REQUIRED)
 
 execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_VERSION
-        OUTPUT_STRIP_TRAILING_WHITESPACE
+     COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+     OUTPUT_VARIABLE GIT_VERSION
+     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-set(RADIANT_VERSION_STRING "${NetRadiant_VERSION}n")
+set(RADIANT_VERSION_STRING "${RADIANT_VERSION}n")
 
 if (GIT_VERSION)
     set(RADIANT_VERSION_STRING "${RADIANT_VERSION_STRING}-git-${GIT_VERSION}")
@@ -95,18 +196,18 @@ endif ()
 if (BUILD_BINARIES)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
 
-    macro(addflags_c args)
+    macro (addflags_c args)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${args}")
-    endmacro()
+    endmacro ()
 
-    macro(addflags_cxx args)
+    macro (addflags_cxx args)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${args}")
-    endmacro()
+    endmacro ()
 
-    macro(addflags args)
+    macro (addflags args)
         addflags_c("${args}")
         addflags_cxx("${args}")
-    endmacro()
+    endmacro ()
 
     addflags("-fno-strict-aliasing")
     if (NOT WIN32)
@@ -128,25 +229,41 @@ 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 ()
 
 if (BUILD_RADIANT)
     set(GTK_TARGET 2 CACHE STRING "GTK target")
     add_definitions(-DGTK_TARGET=${GTK_TARGET})
-endif()
+
+    if (WIN32)
+        add_definitions(-DWORKAROUND_WINDOWS_FLOATING_WINDOW=1)
+
+        if (GTK_TARGET EQUAL 2)
+            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 ()
 
 #-----------------------------------------------------------------------
 # Defs
 #-----------------------------------------------------------------------
 
 if (BUILD_BINARIES)
-    add_definitions(-DRADIANT_VERSION="${NetRadiant_VERSION}")
-    add_definitions(-DRADIANT_MAJOR_VERSION="${NetRadiant_VERSION_MAJOR}")
-    add_definitions(-DRADIANT_MINOR_VERSION="${NetRadiant_VERSION_MINOR}")
-    add_definitions(-DRADIANT_PATCH_VERSION="${NetRadiant_VERSION_PATCH}")
-
-    add_definitions(-DRADIANT_ABOUTMSG="${NetRadiant_ABOUT}")
+    add_definitions(-DRADIANT_VERSION="${RADIANT_VERSION}")
+    add_definitions(-DRADIANT_VERSION_STRING="${RADIANT_VERSION_STRING}")
 
     if (NOT CMAKE_BUILD_TYPE MATCHES Release)
         add_definitions(-D_DEBUG=1)
@@ -154,12 +271,14 @@ if (BUILD_BINARIES)
 endif ()
 
 if (BUILD_RADIANT)
-    macro(disable_deprecated name gtk2only)
+    add_definitions(-DRADIANT_ABOUTMSG="${RADIANT_ABOUTMSG}")
+
+    macro (disable_deprecated name gtk2only)
         add_definitions(-D${name}_DISABLE_SINGLE_INCLUDES)
         if ((${gtk2only} EQUAL 0) OR (GTK_TARGET EQUAL 2))
             add_definitions(-D${name}_DISABLE_DEPRECATED)
         endif ()
-    endmacro()
+    endmacro ()
 
     disable_deprecated(ATK 0)
     disable_deprecated(G 0)
@@ -170,35 +289,28 @@ if (BUILD_RADIANT)
 endif ()
 
 if (BUILD_BINARIES)
-    if (APPLE)
-        if (BUILD_RADIANT)
-        option(XWINDOWS "Build against X11" ON)
-        endif()
-
-        add_definitions(
-                -DPOSIX=1
-        )
+    add_custom_target(binaries ALL)
 
+    if(APPLE OR ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
         link_directories(
-                /usr/local/lib
+            /usr/local/lib
         )
-    elseif (WIN32)
+    endif ()
+
+    if (WIN32)
         add_definitions(
-                -DWIN32=1
-                -D_WIN32=1
+            -DWIN32=1
+            -D_WIN32=1
         )
     else ()
-        if (BUILD_RADIANT)
-             set(XWINDOWS ON)
-        endif ()
-
         add_definitions(
-                -DPOSIX=1
+            -DPOSIX=1
         )
     endif ()
 endif ()
 
-if (BUILD_RADIANT AND XWINDOWS)
+if (BUILD_RADIANT AND NOT APPLE AND NOT WIN32)
+    set(XWINDOWS ON)
     find_package(X11 REQUIRED)
     include_directories(${X11_INCLUDE_DIR})
     add_definitions(-DXWINDOWS=1)
@@ -208,48 +320,122 @@ if (BUILD_BINARIES)
     include_directories("${PROJECT_SOURCE_DIR}/include")
     include_directories("${PROJECT_SOURCE_DIR}/libs")
 
-    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})
-
-    macro(copy_dlls target)
-        if (BUNDLE_LIBRARIES AND WIN32)
+    macro (copy_dlls target)
+        if (BUNDLE_LIBRARIES AND BUNDLING_SUPPORTED)
             add_custom_command(TARGET ${target} POST_BUILD
-                    COMMAND bash
-                    ARGS -c "ldd '$<TARGET_FILE:${target}>' | egrep -i '\\.dll ' | grep -iv '/c/Windows' | awk '{ print $1 }' | while read dll; do dllbasename=\"$(which \"$dll\")\"; [ -f \"${PROJECT_BINARY_DIR}/$dllbasename\" ] || cp --preserve=timestamps \"$dllbasename\" '${PROJECT_BINARY_DIR}'; done"
-                    VERBATIM
+                COMMAND "${PROJECT_SOURCE_DIR}/library-bundler"
+                "register" "${PROJECT_BINARY_DIR}" "$<TARGET_FILE:${target}>"
+                VERBATIM
             )
-        endif ()
-    endmacro()
-
-    macro(bundle_stuff target)
-        if (BUNDLE_LIBRARIES AND WIN32)
-                add_custom_command(TARGET ${target} POST_BUILD
-                        COMMAND bash
-                        ARGS -c "mkdir -p '${PROJECT_BINARY_DIR}/share/themes'; mkdir -p '${PROJECT_BINARY_DIR}/lib'; mingw=\"$(echo '${CMAKE_C_COMPILER}' | sed -e 's|/bin/.*||')\"; [ -d '${PROJECT_BINARY_DIR}/share/themes/MS-Windows' ] || cp -r --preserve=timestamps \"$mingw/share/themes/MS-Windows\" '${PROJECT_BINARY_DIR}/share/themes/'; [ -d '${PROJECT_BINARY_DIR}/lib/gdk-pixbuf-2.0' ] || cp -r --preserve=timestamps \"$mingw/lib/gdk-pixbuf-2.0\" '${PROJECT_BINARY_DIR}/lib/'; [ -d '${PROJECT_BINARY_DIR}/lib/gtk-2.0' ] || cp -r --preserve=timestamps \"$mingw/lib/gtk-2.0\" '${PROJECT_BINARY_DIR}/lib/'"
-                        VERBATIM
-                        )
-
-                file(GLOB DLL_FILES ${PROJECT_BINARY_DIR}/*.dll)
-
-                install(FILES
-                    ${DLL_FILES}
-                    DESTINATION ${CMAKE_INSTALL_PREFIX}
-                )
-
-                install(DIRECTORY
-                        ${PROJECT_BINARY_DIR}/lib
-                        ${PROJECT_BINARY_DIR}/share
-                        DESTINATION ${CMAKE_INSTALL_PREFIX}
-                )
+            add_dependencies(bundle ${target})
         endif ()
     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 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")
+
+    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 "${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 ${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 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")
+
+    add_dependencies(builtins gtkglext)
+    set_target_properties(gtkglext PROPERTIES EXCLUDE_FROM_ALL ON)
+endif ()
+
+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
 #-----------------------------------------------------------------------
@@ -283,23 +469,25 @@ endif ()
 #-----------------------------------------------------------------------
 
 if (BUILD_BINARIES)
-    if (CMAKE_EXECUTABLE_SUFFIX)
-        string(REGEX REPLACE "^[.]" "" RADIANT_EXECUTABLE ${CMAKE_EXECUTABLE_SUFFIX})
-    endif ()
+    macro (radiant_tool name)
+        add_dependencies(binaries ${name})
+
+        if (WIN32)
+            add_executable(${name} ${ARGN} ${PROJECT_SOURCE_DIR}/include/lib.rc)
+        else ()
+            add_executable(${name} ${ARGN})
+        endif()
+
+        copy_dlls(${name})
 
-    macro(radiant_tool name)
-        add_executable(${name} ${ARGN})
         install(
-                TARGETS ${name}
-                RUNTIME DESTINATION ${RADIANT_BIN_DIR}
+            TARGETS ${name}
+            RUNTIME DESTINATION ${RADIANT_BIN_DIR}
         )
-    endmacro()
+    endmacro ()
 
     if (BUILD_RADIANT)
-        add_subdirectory(radiant _radiant)
-        set_target_properties(${RADIANT_BASENAME} PROPERTIES
-                COMPILE_DEFINITIONS RADIANT_EXECUTABLE="${RADIANT_EXECUTABLE}"
-                )
+        add_subdirectory(radiant)
     endif ()
 endif ()
 
@@ -327,11 +515,11 @@ set(GAMEPACKS_LICENSE_LIST free CACHE STRING "Download game packs by license")
 set(GAMEPACKS_NAME_LIST none CACHE STRING "Download game packs by name")
 
 if (DOWNLOAD_GAMEPACKS)
-   add_custom_target(game_packs ALL
-      COMMAND "${PROJECT_SOURCE_DIR}/gamepack-manager" --license ${GAMEPACKS_LICENSE_LIST} --name ${GAMEPACKS_NAME_LIST} --download-dir "${PROJECT_BINARY_DIR}/download" --install-dir "${PROJECT_BINARY_DIR}" --download --install
-      COMMENT "Downloading ${GAMEPACKS_LICENSE_LIST} game packs"
-   )
-endif()
+    add_custom_target(gamepacks ALL
+       COMMAND "${PROJECT_SOURCE_DIR}/gamepack-manager" --license ${GAMEPACKS_LICENSE_LIST} --name ${GAMEPACKS_NAME_LIST} --download-dir "${GAMEPACKS_DOWNLOAD_DIR}" --install-dir "${PROJECT_BINARY_DIR}/gamepacks" --download --install
+       COMMENT "Downloading game packs"
+    )
+endif ()
 
 #-----------------------------------------------------------------------
 # Install
@@ -339,41 +527,55 @@ endif()
 
 if (BUILD_BINARIES)
     install(DIRECTORY
-            setup/data/tools
-            docs
-            DESTINATION ${RADIANT_DATA_DIR}
+        setup/data/tools/base
+        setup/data/tools/bitmaps
+        setup/data/tools/gl
+        setup/data/tools/plugins
+        docs
+        DESTINATION ${RADIANT_DATA_DIR}
+    )
+
+    install(FILES
+        setup/data/tools/global.xlink
+        DESTINATION ${RADIANT_DATA_DIR}
     )
 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 ()
-
-    file(GLOB GAME_DIRS ${PROJECT_BINARY_DIR}/*.game)
-
     install(DIRECTORY
-            ${PROJECT_BINARY_DIR}/games
-            ${GAME_DIRS}
-            DESTINATION ${RADIANT_DATA_DIR}
+        ${PROJECT_BINARY_DIR}/gamepacks
+        DESTINATION ${RADIANT_DATA_DIR}
     )
-endif()
+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()
+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 ()
 
 include(cmake/scripts/package.cmake)