Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix handling of PIONEER_DATA_DIR 

The PIONEER_DATA_DIR option, which was already in use in the CMake
script, is now present in the CMake UI like it should.

CMake will now install the data files inside the path specified
by PIONEER_DATA_DIR, instead of a hardcoded path.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
master
Paul Cercueil 2018-08-28 22:46:21 +02:00
parent 70153621ab
commit 5003ec214c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -54,9 +54,12 @@ string(TIMESTAMP PROJECT_VERSION "%Y%m%d")
add_definitions(-DPIONEER_VERSION="${PROJECT_VERSION}")
if (NOT PIONEER_DATA_DIR)
file(TO_NATIVE_PATH ${CMAKE_INSTALL_FULL_DATADIR}/pioneer/data PIONEER_DATA_DIR)
endif(NOT PIONEER_DATA_DIR)
add_definitions(-DPIONEER_DATA_DIR="${PIONEER_DATA_DIR}")
set(PIONEER_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/pioneer/data CACHE PATH
"Path where game data will be installed" FORCE)
endif (NOT PIONEER_DATA_DIR)
file(TO_NATIVE_PATH ${PIONEER_DATA_DIR} _PIONEER_DATA_DIR)
add_definitions(-DPIONEER_DATA_DIR="${_PIONEER_DATA_DIR}")
if (MINGW)
# Enable PRIxYY macros on MinGW
@ -232,8 +235,8 @@ set_target_properties(${PROJECT_NAME} modelcompiler savegamedump pioneerLib PROP
install(TARGETS ${PROJECT_NAME} modelcompiler savegamedump
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
install(DIRECTORY data
DESTINATION ${CMAKE_INSTALL_DATADIR}/pioneer
install(DIRECTORY data/
DESTINATION ${PIONEER_DATA_DIR}
PATTERN "listdata.*" EXCLUDE
PATTERN "Makefile.am" EXCLUDE
)