external
/
uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #12 from tehnick/fix-version 

Add possibility to specify UHUB_REVISION manually.
This commit is contained in:
Jan Vidar Krey 2012-10-13 10:34:39 -07:00
parent ba59e1a00e dcfcf3110d
commit 7fae42aa4d
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -121,13 +121,20 @@ if(UNIX)
endif() endif()
endif() endif()
if(GIT_FOUND AND IS_DIRECTORY ".git") if (NOT UHUB_REVISION AND GIT_FOUND)
execute_process(COMMAND ${GIT_EXECUTABLE} show -s --pretty=format:%h OUTPUT_VARIABLE UHUB_REVISION) execute_process(COMMAND ${GIT_EXECUTABLE} show -s --pretty=format:%h OUTPUT_VARIABLE UHUB_REVISION_TEMP)
set (UHUB_GIT_VERSION "${UHUB_VERSION_MAJOR}.${UHUB_VERSION_MINOR}.${UHUB_VERSION_PATCH}-git-${UHUB_REVISION}") if (UHUB_REVISION_TEMP)
else() set (UHUB_REVISION "git-${UHUB_REVISION_TEMP}")
set (UHUB_GIT_VERSION "${UHUB_VERSION_MAJOR}.${UHUB_VERSION_MINOR}.${UHUB_VERSION_PATCH}-release") endif()
endif() endif()
if (NOT UHUB_REVISION)
set (UHUB_REVISION "release")
endif()
set (UHUB_GIT_VERSION "${UHUB_VERSION_MAJOR}.${UHUB_VERSION_MINOR}.${UHUB_VERSION_PATCH}-${UHUB_REVISION}")
message (STATUS "Current uHub version: ${UHUB_GIT_VERSION}")
if(OPENSSL_FOUND) if(OPENSSL_FOUND)
add_definitions(-DSSL_SUPPORT=1) add_definitions(-DSSL_SUPPORT=1)
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})