• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7532 (tree)
Time2019-03-29 22:58:09
Authorzmatsuo

Log Message

git-svn、putty.issがない場合に対応するようにした

Change Summary

Incremental Difference

--- trunk/CMakeLists.txt (revision 7531)
+++ trunk/CMakeLists.txt (revision 7532)
@@ -57,8 +57,14 @@
5757 if(Git_FOUND)
5858 execute_process(
5959 COMMAND ${GIT_EXECUTABLE} svn log --oneline -1
60- OUTPUT_VARIABLE ov)
61- string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
60+ RESULT_VARIABLE rv
61+ OUTPUT_VARIABLE ov
62+ ERROR_QUIET)
63+ if(${rv})
64+ message("git svn error? please check git svn")
65+ else()
66+ string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
67+ endif()
6268 endif()
6369 elseif(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
6470 # svn
--- trunk/ttssh2/ttxssh/CMakeLists.txt (revision 7531)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt (revision 7532)
@@ -134,6 +134,11 @@
134134
135135 ### create puttyversion.h
136136
137+set(PUTTY_ISS "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss")
138+if(NOT EXISTS ${PUTTY_ISS})
139+ message(FATAL_ERROR "${PUTTY_ISS} not found")
140+endif()
141+
137142 file(READ "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss" iis)
138143
139144 string(REGEX MATCH "VersionInfoTextVersion=([^\n]+)\n" _ ${iis})
Show on old repository browser