Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed 'Not a git repository' bug related with real out of source build from the git repository

This commit is contained in:
filux 2015-01-31 10:30:19 +01:00
parent 504dc7dfd8
commit 9977fd2606
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -242,7 +242,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
SET(GIT_LIVE_REV_CMD "`git rev-list HEAD --count`.`git log -1 --format=%h`")
SET(GIT_LIVE_REV_CMD "`cd '${PROJECT_SOURCE_DIR}' && git rev-list HEAD --count`.`cd '${PROJECT_SOURCE_DIR}' && git log -1 --format=%h`")
MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}] CMD [${GIT_LIVE_REV_CMD}]")

2
source/g3d_viewer/CMakeLists.txt
View File

@ -163,7 +163,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
IF(EXISTS ${HELP2MAN})
MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]")
SET(MG_MANPAGE_DESCRIPTION "G3D Model editor for the popular 3D realtime stragegy game")
SET(MG_MANPAGE_DESCRIPTION "G3D Model editor for the popular 3D realtime strategy game")
IF(EXISTS ${XVFB_EXEC})
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")

2
source/glest_game/CMakeLists.txt
View File

@ -317,7 +317,7 @@ IF(BUILD_MEGAGLEST)
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
OPTIONAL REGEX "/.git" EXCLUDE)
MESSAGE(STATUS "**Source package detected git folder structure.")
#MESSAGE(STATUS "**Source package detected git folder structure.")
# Installation of the program desktop file
INSTALL(FILES

2
source/glest_map_editor/CMakeLists.txt
View File

@ -156,7 +156,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
IF(EXISTS ${HELP2MAN})
MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]")
SET(MG_MANPAGE_DESCRIPTION "Map editor for the popular 3D realtime stragegy game")
SET(MG_MANPAGE_DESCRIPTION "Map editor for the popular 3D realtime strategy game")
IF(EXISTS ${XVFB_EXEC})
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")

2
source/shared_lib/CMakeLists.txt
View File

@ -455,7 +455,7 @@ option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF)
IF(NOT WIN32)
ADD_LIBRARY(${TARGET_NAME} STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
MESSAGE(STATUS "Building shared game library as a STATIC library and saving to [${LIBRARY_OUTPUT_PATH}]")
#MESSAGE(STATUS "Building shared game library as a STATIC library and saving to [${LIBRARY_OUTPUT_PATH}]")
ELSE()
SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
ADD_LIBRARY(${TARGET_NAME} STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})