X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=CMakeLists.txt;h=35ca21d66983b8a9c53e1c2dbdc9c1f3f3366d9b;hb=1b752c1b8aaafbe513edf2dd633d5588fb7f4a68;hp=bfecfd18554ae26c4f8da343df2e9d91d99ca4dc;hpb=90dbb14be75ae1305790463f23d47f0fb46f0c79;p=xonotic%2Fnetradiant.git diff --git a/CMakeLists.txt b/CMakeLists.txt index bfecfd18..35ca21d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,9 @@ 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 "...") +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 "...") @@ -30,20 +32,22 @@ set(RADIANT_BIN_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...") set(RADIANT_DATA_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...") if (FHS_INSTALL) - set(RADIANT_LIB_DIR lib/${RADIANT_BASENAME}) - set(RADIANT_BIN_DIR bin) - set(RADIANT_DATA_DIR share/${RADIANT_BASENAME}) + 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}) 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") @@ -56,7 +60,7 @@ execute_process( 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}") @@ -134,6 +138,10 @@ endif () if (BUILD_RADIANT) set(GTK_TARGET 2 CACHE STRING "GTK target") add_definitions(-DGTK_TARGET=${GTK_TARGET}) + + if (GTK_TARGET EQUAL 2 AND WIN32) + add_definitions(-DWORKAROUND_WINDOWS_GTK2_GLWIDGET=1) + endif () endif () #----------------------------------------------------------------------- @@ -141,12 +149,8 @@ endif () #----------------------------------------------------------------------- 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,6 +158,8 @@ if (BUILD_BINARIES) endif () if (BUILD_RADIANT) + 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)) @@ -170,6 +176,8 @@ if (BUILD_RADIANT) endif () if (BUILD_BINARIES) + add_custom_target(binaries ALL) + if(APPLE OR ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") link_directories( /usr/local/lib @@ -207,36 +215,18 @@ if (BUILD_BINARIES) option(BUNDLE_LIBRARIES "Bundle libraries" ${BUNDLE_LIBRARIES_DEFAULT}) - macro (copy_dlls target) - if (BUNDLE_LIBRARIES AND WIN32) - add_custom_command(TARGET ${target} POST_BUILD - COMMAND bash - ARGS -c "ldd '$' | 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 - ) - endif () - endmacro () + if (BUNDLE_LIBRARIES) + add_subdirectory(bundle) + endif () - macro (bundle_stuff target) - if (BUNDLE_LIBRARIES AND WIN32) + macro (copy_dlls target) + if (BUNDLE_LIBRARIES) 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/'" + COMMAND "${PROJECT_SOURCE_DIR}/library-bundler" + "register" "${PROJECT_BINARY_DIR}" "$" 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 () @@ -279,7 +269,13 @@ if (BUILD_BINARIES) endif () macro (radiant_tool name) - add_executable(${name} ${ARGN}) + add_dependencies(binaries ${name}) + + if (BUNDLE_LIBRARIES AND WIN32) + add_executable(${name} ${ARGN} ${PROJECT_SOURCE_DIR}/include/lib.rc) + else () + add_executable(${name} ${ARGN}) + endif () copy_dlls(${name}) @@ -290,7 +286,7 @@ if (BUILD_BINARIES) endmacro () if (BUILD_RADIANT) - add_subdirectory(radiant _radiant) + add_subdirectory(radiant) set_target_properties(${RADIANT_BASENAME} PROPERTIES COMPILE_DEFINITIONS RADIANT_EXECUTABLE="${RADIANT_EXECUTABLE}" ) @@ -321,9 +317,9 @@ 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" + 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 () @@ -349,11 +345,8 @@ if (DOWNLOAD_GAMEPACKS) set(GAME_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") endif () - file(GLOB GAME_DIRS ${PROJECT_BINARY_DIR}/*.game) - install(DIRECTORY - ${PROJECT_BINARY_DIR}/games - ${GAME_DIRS} + ${PROJECT_BINARY_DIR}/gamepacks DESTINATION ${RADIANT_DATA_DIR} ) endif ()