Tera TermRevision: 9713
https://osdn.net/projects/ttssh2/scm/svn/commits/9713
Author: zmatsuo
Date: 2022-01-31 01:14:03 +0900 (Mon, 31 Jan 2022)
Log Message:
-----------
cmakeビルドでVS2005でもビルドできるよう修正
- ttxssh はビルドから外すようにした
- r9668 で chmcmd のファイル名に誤りがあったので修正
- cmake 3.12以下でも動作するよう修正
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/9668
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/doc/CMakeLists.txt
trunk/doc/makechm.cmake
-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2022-01-30 16:13:53 UTC (rev 9712)
+++ trunk/CMakeLists.txt 2022-01-30 16:14:03 UTC (rev 9713)
@@ -12,6 +12,7 @@
option(SUPPORT_OLD_WINDOWS "windows 95 support" ${SUPPORT_OLD_WINDOWS_DEFAULT})
option(ENABLE_TTXSAMPLES "TTXSamples" ON)
option(MORE_WARNING "stronger warning" OFF)
+option(TTXSSH "ttxssh" ON)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -23,6 +24,7 @@
#set(_WIN32_WINNT "0x0501") # Tera Term がビルドできる最小値
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
set(_WIN32_WINNT "0x0501")
+ set(TTXSSH OFF)
endif()
if(MSVC)
@@ -173,7 +175,9 @@
add_subdirectory(teraterm)
add_subdirectory(ttpmenu)
add_subdirectory(TTProxy)
-add_subdirectory(ttssh2)
+if(TTXSSH)
+ add_subdirectory(ttssh2)
+endif(TTXSSH)
add_subdirectory(TTXKanjiMenu)
if(${ENABLE_TTXSAMPLES})
add_subdirectory(TTXSamples)
Modified: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt 2022-01-30 16:13:53 UTC (rev 9712)
+++ trunk/doc/CMakeLists.txt 2022-01-30 16:14:03 UTC (rev 9713)
@@ -13,7 +13,7 @@
else()
set(HHC "HHC-NOTFOUND")
find_program(
- CHMCMD chmcmd2
+ CHMCMD chmcmd
)
endif()
message("hhc=${HHC}")
Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake 2022-01-30 16:13:53 UTC (rev 9712)
+++ trunk/doc/makechm.cmake 2022-01-30 16:14:03 UTC (rev 9713)
@@ -47,7 +47,11 @@
separate_arguments(CONV_CMD_OPTION)
set(CMD ${CONV_CMD} ${CONV_CMD_OPTION})
- string(JOIN " " CMD_PRINT ${CMD})
+ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0")
+ string(JOIN " " CMD_PRINT ${CMD})
+ else()
+ string(REPLACE ";" " " CMD_PRINT "${CMD}")
+ endif()
#message(STATUS ${CMD_PRINT})
execute_process(