diff options
| author |  Voker57 | 2008-07-18 19:46:08 +0000 |
|---|---|---|
| committer | Voker57 | 2008-07-18 19:46:08 +0000 |
| commit | 3464bbbd988a374ff1d5ee67ae1c6f648b5f76ae (patch) | |
| tree | a8b79c726deda00131ff45feb9de31877b8d3c09 | |
| parent | fix for #20 on trunk (diff) | |
| download | KVIrc-3464bbbd988a374ff1d5ee67ae1c6f648b5f76ae.tar.gz KVIrc-3464bbbd988a374ff1d5ee67ae1c6f648b5f76ae.tar.bz2 KVIrc-3464bbbd988a374ff1d5ee67ae1c6f648b5f76ae.zip | |
Fixed configuration not from SVN working copy.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2096 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | cmake/modules/FindSubversion.cmake | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fb7763fde..eb51e6256 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,8 +51,12 @@ FIND_PACKAGE(Subversion) IF(Subversion_FOUND) MESSAGE("Found Subversion ${Subversion_VERSION_SVN}") Subversion_WC_INFO(${PROJECT_SOURCE_DIR} KVIrc) - SET(CMAKE_KVIRC_BUILD_REVISION ${KVIrc_WC_REVISION}) - MESSAGE("Current revision is ${KVIrc_WC_REVISION}") + IF(${KVIrc_WC_REVISION}) + SET(CMAKE_KVIRC_BUILD_REVISION ${KVIrc_WC_REVISION}) + MESSAGE("Current revision is ${KVIrc_WC_REVISION}") + ELSE() + MESSAGE("No Subversion working copy found") + ENDIF() ELSE() MESSAGE("Subversion not found. No revision number will be used") ENDIF() diff --git a/cmake/modules/FindSubversion.cmake b/cmake/modules/FindSubversion.cmake index 6bdcdc5b0..dbc38bc6b 100644 --- a/cmake/modules/FindSubversion.cmake +++ b/cmake/modules/FindSubversion.cmake @@ -78,7 +78,7 @@ IF(Subversion_SVN_EXECUTABLE) OUTPUT_STRIP_TRAILING_WHITESPACE) IF(NOT ${Subversion_svn_info_result} EQUAL 0) - MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}") + MESSAGE("Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}") ELSE(NOT ${Subversion_svn_info_result} EQUAL 0) STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*" |