Merge deb and non-deb

12 years ago · 9a900908cd
parent e22b7c8fc1
commit 9a900908cd
1 changed files with 72 additions and 88 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -331,17 +331,16 @@ if (CMAKE_COMPILER_IS_GNUCC)
    endif("${GCC_VERSION}" VERSION_GREATER 4.6 OR "${GCC_VERSION}" VERSION_EQUAL 4.6)
 endif (CMAKE_COMPILER_IS_GNUCC)

-if (NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE)
-    ## Non Debian based Linux building
-    # paths
-    set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Where to install binaries")
-    set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Sets the root of data directories to a non-default location")
-    set(DATADIR "${DATAROOTDIR}/games/openmw" CACHE PATH "Sets the openmw data directories to a non-default location")
-    set(DOCDIR "${DATAROOTDIR}/doc/openmw" CACHE PATH "Sets the doc directory to a non-default location.")
-    set(MANDIR "${DATAROOTDIR}/man" CACHE PATH "Where to install manpages")
-    set(SYSCONFDIR "/etc/openmw" CACHE PATH "Set config dir")
-    set(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE PATH "Set icon dir")
-    set(LICDIR "${DATAROOTDIR}/licenses/openmw" CACHE PATH "Sets the openmw license directory to a non-default location.")
+IF(NOT WIN32 AND NOT APPLE)
+    ## Debian and non debian Linux building
+    # Paths
+    SET(CMAKE_INSTALL_PREFIX "/usr")
+    SET(SYSCONFDIR "../etc/openmw" CACHE PATH "Set config dir")
+    IF (NOT DPKG_PROGRAM)
+        ## Non debian specific
+        SET(SYSCONFDIR "/etc/openmw" CACHE PATH "Set config dir")
+        SET(BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Where to install binaries")
+        SET(LICDIR "${CMAKE_INSTALL_PREFIX}/share/licenses/openmw" CACHE PATH "Sets the openmw license directory to a non-default location.")

        # Install binaries
        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw" DESTINATION "${BINDIR}" )
@ -361,38 +360,20 @@ if (NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE)
            INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/opencs" DESTINATION "${BINDIR}" )
        ENDIF(BUILD_OPENCS)

-    # Install icon and desktop file
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "${DATAROOTDIR}/applications")
-    INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}")
-    IF(BUILD_OPENCS)
-        INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/opencs/opencs.png" DESTINATION "${ICONDIR}")
-        INSTALL(FILES "${OpenMW_BINARY_DIR}/opencs.desktop" DESTINATION "${DATAROOTDIR}/applications")
-    ENDIF(BUILD_OPENCS)
-
-    # Install global configuration files
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "${SYSCONFDIR}" )
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/transparency-overrides.cfg" DESTINATION "${SYSCONFDIR}" )
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "${SYSCONFDIR}" RENAME "openmw.cfg" )
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/opencs.cfg" DESTINATION "${SYSCONFDIR}" )
-
-    # Install resources
-    INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "${DATADIR}" )
-
        # Install licenses
        INSTALL(FILES "DejaVu Font License.txt" DESTINATION "${LICDIR}" )
        INSTALL(FILES "Daedric Font License.txt" DESTINATION "${LICDIR}" )
        INSTALL(FILES "OFL.txt" DESTINATION "${LICDIR}" )
        INSTALL(FILES "extern/shiny/License.txt" DESTINATION "${LICDIR}" RENAME "Shiny License.txt" )
-endif(NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE)
-
-if(DPKG_PROGRAM)
-    # Paths
-    SET(CMAKE_INSTALL_PREFIX "/usr")
-    SET(SYSCONFDIR "../etc/openmw" CACHE PATH "Set config dir")
+    ENDIF (NOT DPKG_PROGRAM)

    # Install icon and desktop file
    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "share/applications/" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
    INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "share/pixmaps/" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
+    IF(BUILD_OPENCS)
+        INSTALL(FILES "${OpenMW_BINARY_DIR}/opencs.desktop" DESTINATION "share/applications/" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "opencs")
+        INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/opencs/opencs.png" DESTINATION "share/pixmaps/" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "opencs")
+    ENDIF(BUILD_OPENCS)

    # Install global configuration files
    INSTALL(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "${SYSCONFDIR}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
@ -404,16 +385,18 @@ if(DPKG_PROGRAM)
    INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "share/games/openmw/" FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT "Resources")
    INSTALL(DIRECTORY DESTINATION "share/games/openmw/data/" COMPONENT "Resources")

-    if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-        exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe" OUTPUT_VARIABLE GIT_VERSION )
+    IF (DPKG_PROGRAM)
+        ## Debian Specific
+        IF(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+            EXEC_PROGRAM("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe" OUTPUT_VARIABLE GIT_VERSION )
            STRING(REGEX REPLACE "openmw-" "" VERSION_STRING "${GIT_VERSION}")
-        exec_program("git" ARGS "config --get user.name" OUTPUT_VARIABLE GIT_NAME )
-        exec_program("git" ARGS "config --get user.email" OUTPUT_VARIABLE GIT_EMAIL)
-        set(PACKAGE_MAINTAINER "${GIT_NAME} <${GIT_EMAIL}>")
-    else()
-        set(VERSION_STRING "${OPENMW_VERSION}")
-        set(PACKAGE_MAINTAINER "unknown")
-    endif()
+            EXEC_PROGRAM("git" ARGS "config --get user.name" OUTPUT_VARIABLE GIT_NAME )
+            EXEC_PROGRAM("git" ARGS "config --get user.email" OUTPUT_VARIABLE GIT_EMAIL)
+            SET(PACKAGE_MAINTAINER "${GIT_NAME} <${GIT_EMAIL}>")
+        ELSE()
+            SET(VERSION_STRING "${OPENMW_VERSION}")
+            SET(PACKAGE_MAINTAINER "unknown")
+        ENDIF()

        SET(CPACK_GENERATOR "DEB")
        SET(CPACK_PACKAGE_NAME "openmw")
@ -430,17 +413,18 @@ if(DPKG_PROGRAM)

        SET(CPACK_DEBIAN_PACKAGE_SECTION "Games")

-    string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
-    execute_process(
+        STRING(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
+        EXECUTE_PROCESS(
            COMMAND ${DPKG_PROGRAM} --print-architecture
            OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
            OUTPUT_STRIP_TRAILING_WHITESPACE
        )
-    set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}_${CPACK_DEBIAN_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+        SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}_${CPACK_DEBIAN_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")


-    include(CPack)
-endif(DPKG_PROGRAM)
+        INCLUDE(CPack)
+    ENDIF(DPKG_PROGRAM)
+ENDIF(NOT WIN32 AND NOT APPLE)

 if(WIN32)
    FILE(GLOB dll_files "${OpenMW_BINARY_DIR}/Release/*.dll")