Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

installing resource files through cmake.

This commit is contained in:
Enno Rehling 2014-07-17 15:55:50 +02:00
parent 4506bff522
commit a4675c61fd
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -79,4 +79,5 @@ add_subdirectory (iniparser)
add_subdirectory (quicklist) add_subdirectory (quicklist)
add_subdirectory (critbit) add_subdirectory (critbit)
add_subdirectory (src eressea) add_subdirectory (src eressea)
install(DIRECTORY res core DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml")
install(DIRECTORY scripts DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.lua")

3
process/cron/run-eressea
View File

@ -13,7 +13,7 @@ if [ -d $REPORTS ]; then
fi fi
mkdir $REPORTS mkdir $REPORTS
$BIN/backup-eressea $GAME $BIN/backup-eressea $GAME
$BIN/run-turn.sh $GAME $BIN/run-turn $GAME
if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then
echo "server did not create orders for turn $TURN in game $GAME" echo "server did not create orders for turn $TURN in game $GAME"
exit 2 exit 2
@ -30,3 +30,4 @@ fi
$BIN/compress.sh $GAME $TURN $BIN/compress.sh $GAME $TURN
$BIN/sendreports.sh $GAME $BIN/sendreports.sh $GAME
$BIN/backup-eressea $GAME $BIN/backup-eressea $GAME
[ $GAME -lt 4 ] && $BIN/send-summary $GAME

2
s/cmake-init
View File

@ -38,6 +38,6 @@ cmake .. \
-DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \ -DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \
-DCMAKE_INCLUDE_PATH=$INCLUDE_PATH \ -DCMAKE_INCLUDE_PATH=$INCLUDE_PATH \
-DCMAKE_PREFIX_PATH=$PREFIX_PATH \ -DCMAKE_PREFIX_PATH=$PREFIX_PATH \
-DCMAKE_INSTALL_PREFIX=$HOME/eressea $* -DCMAKE_INSTALL_PREFIX=$HOME/eressea/server $*
cd $OLDPWD cd $OLDPWD

2
src/CMakeLists.txt
View File

@ -184,7 +184,7 @@ add_test(
COMMAND $<TARGET_FILE:eressea> runtests.lua COMMAND $<TARGET_FILE:eressea> runtests.lua
) )
install(TARGETS eressea DESTINATION bin) install(TARGETS eressea DESTINATION "bin")
if (SQLITE3_FOUND) if (SQLITE3_FOUND)
target_link_libraries(eressea ${SQLITE3_LIBRARIES}) target_link_libraries(eressea ${SQLITE3_LIBRARIES})