Skip to content
Snippets Groups Projects
Commit 6777484a authored by marco's avatar marco
Browse files

silence warning about not being an svn checkout

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2556 5a81b35b-ba03-0410-adc8-b2c5c5119f08
parent 419e5840
Branches
Tags
No related merge requests found
...@@ -7,14 +7,17 @@ set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/ReadMe.txt") ...@@ -7,14 +7,17 @@ set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/ReadMe.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0") set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_PATCH "0a1_${OST_REV}") if (OST_REV)
set(CPACK_PACKAGE_VERSION_PATCH "0a1_${OST_REV}")
else()
set(CPACK_PACKAGE_VERSION_PATCH "0a1")
endif()
set(OST_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(OST_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
message("building OST version: ${OST_VERSION}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "openstructure ${OST_VERSION}" ) set(CPACK_PACKAGE_INSTALL_DIRECTORY "openstructure ${OST_VERSION}" )
IF(WIN32 AND NOT UNIX) IF(WIN32 AND NOT UNIX)
# There is a bug in NSI that does not handle full unix paths properly. Make # There is a bug in NSI that does not handle full unix paths properly. Make
# sure there is at least one set of four (4) backlasshes. # sure there is at least one set of four (4) backlashes.
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/graphics/\\\\icon_32.png") set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/graphics/\\\\icon_32.png")
#set(CPACK_NSIS_INSTALLED_ICON_NAME "bin/\\\\gosty.exe") #set(CPACK_NSIS_INSTALLED_ICON_NAME "bin/\\\\gosty.exe")
set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}") set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
......
...@@ -629,10 +629,12 @@ endmacro() ...@@ -629,10 +629,12 @@ endmacro()
macro(get_ost_rev) macro(get_ost_rev)
if (NOT OST_REV) if (NOT OST_REV)
if (NOT WIN32) if (NOT WIN32)
exec_program("svn" if (EXISTS .svn)
ARGS "info |grep Revision|awk '{print $2}'" exec_program("svn"
OUTPUT_VARIABLE OST_REV ARGS "info |grep Revision|awk '{print $2}'"
) OUTPUT_VARIABLE OST_REV
)
endif()
else() else()
exec_program("svnversion.exe" exec_program("svnversion.exe"
ARGS "" ARGS ""
...@@ -642,5 +644,7 @@ macro(get_ost_rev) ...@@ -642,5 +644,7 @@ macro(get_ost_rev)
string(REGEX REPLACE "[A-Za-z]" "" OST_REV ${OST_REV}) string(REGEX REPLACE "[A-Za-z]" "" OST_REV ${OST_REV})
endif() endif()
endif() endif()
message("Revision: ${OST_REV}") if (OST_REV)
message("Revision: ${OST_REV}")
endif()
endmacro() endmacro()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment