diff options
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/arena/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/font/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/image/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/lang/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/music/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/sound/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/base/path.h.in | 3 |
9 files changed, 17 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 43ae819..f36bd84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,8 @@ # -DWin=1 # build windows port # -DNLS=1 # enable Gettext NLS # -DApple=1 # build apple port +# -CMAKE_INSTALL_PREFIX=/bla/ # install prefix +# -CMAKE_DATA_PATH=/other/bla/ # install path for data ############################################################################### # OUR OWN CODE HACKS (WHEN CODE CLEANUP IS FINISHED REMOVE THIS) # ALSO CONTAINS IMPORTANT DEFINITIONS [PREFIX,...] @@ -18,6 +20,8 @@ ADD_DEFINITIONS ( -DSUPPORT_NET_UNIX_UDP ) SET ( TUXANCI_VERSION "9999" ) SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src ) +# data because some distributions want different data placement +SET ( CMAKE_DATA_PATH "/usr/local/share/" CACHE PATH "Install path prefix" ) SET ( CMAKE_INSTALL_PREFIX "/usr/local/" CACHE PATH "Install path prefix" ) CONFIGURE_FILE ( ${WORKDIR}/base/path.h.in ${WORKDIR}/base/path.h ) ############################################################################### @@ -47,7 +51,6 @@ SET ( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} ) # this specify location of additional cmake sources SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ) #various variables -SET ( CMAKE_INSTALL_DATADIR share/ ) SET ( CMAKE_INSTALL_ETCDIR /etc ) SET ( CMAKE_INSTALL_BINDIR bin ) SET ( CMAKE_INSTALL_LIBDIR lib ) @@ -150,7 +153,7 @@ IF ( NOT Win ) ENDIF ( NOT Win ) INCLUDE_DIRECTORIES ( ${SDL_INCLUDE_DIR} - ${SDLIMAGE_INCLUDE_DIR} + ${SDLTTF_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ) @@ -180,11 +183,11 @@ ADD_SUBDIRECTORY ( src ) # path which user send us ADD_SUBDIRECTORY ( data ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/LICENCE - DESTINATION share/doc/${APPNAME}-${TUXANCI_VERSION}/ ) + DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/ ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/AUTHORS - DESTINATION share/doc/${APPNAME}-${TUXANCI_VERSION}/ ) + DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/ ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README - DESTINATION share/doc/${APPNAME}-${TUXANCI_VERSION}/ ) + DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/ ) # windows quirk IF ( NOT Server ) IF ( Win ) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 03976e5..2d2c95f 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -18,7 +18,7 @@ IF ( NOT Server ) DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/) IF ( NOT Win ) INSTALL ( FILES tuxanci.ico - DESTINATION share/doc/${APPNAME}-${TUXANCI_VERSION}/ ) + DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/ ) ENDIF ( NOT Win ) ENDIF ( NOT Server ) ###############################################################################
\ No newline at end of file diff --git a/data/arena/CMakeLists.txt b/data/arena/CMakeLists.txt index 36cdae3..62eb332 100644 --- a/data/arena/CMakeLists.txt +++ b/data/arena/CMakeLists.txt @@ -9,5 +9,5 @@ ############################################################################### FILE ( GLOB files "*.map" ) INSTALL ( FILES ${files} - DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/arena/ ) + DESTINATION ${CMAKE_DATA_PATH}/${APPNAME}/arena/ ) ###############################################################################
\ No newline at end of file diff --git a/data/font/CMakeLists.txt b/data/font/CMakeLists.txt index 3c9e283..d4d62e4 100644 --- a/data/font/CMakeLists.txt +++ b/data/font/CMakeLists.txt @@ -9,5 +9,5 @@ ############################################################################### FILE ( GLOB files "*.ttf" ) INSTALL ( FILES ${files} - DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/font/ ) + DESTINATION ${CMAKE_DATA_PATH}/${APPNAME}/font/ ) ###############################################################################
\ No newline at end of file diff --git a/data/image/CMakeLists.txt b/data/image/CMakeLists.txt index 4d428a1..1f4903e 100644 --- a/data/image/CMakeLists.txt +++ b/data/image/CMakeLists.txt @@ -9,5 +9,5 @@ ############################################################################### FILE ( GLOB files "*.png" ) INSTALL ( FILES ${files} - DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/images/ ) + DESTINATION ${CMAKE_DATA_PATH}/${APPNAME}/images/ ) ###############################################################################
\ No newline at end of file diff --git a/data/lang/CMakeLists.txt b/data/lang/CMakeLists.txt index 749a747..c3640bf 100644 --- a/data/lang/CMakeLists.txt +++ b/data/lang/CMakeLists.txt @@ -10,6 +10,6 @@ IF ( NOT NO_Audio ) FILE ( GLOB files "*.lang" ) INSTALL ( FILES ${files} - DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/lang/ ) + DESTINATION ${CMAKE_DATA_PATH}/${APPNAME}/lang/ ) ENDIF ( NOT NO_Audio ) ###############################################################################
\ No newline at end of file diff --git a/data/music/CMakeLists.txt b/data/music/CMakeLists.txt index 140cbf3..0469b04 100644 --- a/data/music/CMakeLists.txt +++ b/data/music/CMakeLists.txt @@ -10,6 +10,6 @@ IF ( NOT NO_Audio ) FILE ( GLOB files "*.ogg" ) INSTALL ( FILES ${files} - DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/music/ ) + DESTINATION ${CMAKE_DATA_PATH}/${APPNAME}/music/ ) ENDIF ( NOT NO_Audio ) ###############################################################################
\ No newline at end of file diff --git a/data/sound/CMakeLists.txt b/data/sound/CMakeLists.txt index 9e60aa7..fd208e4 100644 --- a/data/sound/CMakeLists.txt +++ b/data/sound/CMakeLists.txt @@ -10,6 +10,6 @@ IF ( NOT NO_Audio ) FILE ( GLOB files "*.ogg" ) INSTALL ( FILES ${files} - DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/sound/ ) + DESTINATION ${CMAKE_DATA_PATH}/${APPNAME}/sound/ ) ENDIF ( NOT NO_Audio ) ###############################################################################
\ No newline at end of file diff --git a/src/base/path.h.in b/src/base/path.h.in index b3e199b..9eaddb7 100644 --- a/src/base/path.h.in +++ b/src/base/path.h.in @@ -5,15 +5,16 @@ #define PATH_H #ifndef __WIN32__ #define PREFIX "@CMAKE_INSTALL_PREFIX@" + #define PATH_DIR "@CMAKE_DATA_PATH@" APPNAME "/" #else #define PREFIX ".." + #define PATH_DIR PREFIX "/share/" APPNAME "/" #endif #ifdef PUBLIC_SERVER #define APPNAME "tuxanci-server" #else #define APPNAME "tuxanci" #endif - #define PATH_DIR PREFIX "/share/" APPNAME "/" #ifndef __WIN32__ #define PATH_MODULES PREFIX "/lib/" APPNAME "/" #define SERVER_CONFIG "/etc/tuxanci-server/server.conf" |