• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision8840 (tree)
Time2020-07-06 22:53:51
Authorzmatsuo

Log Message

cmakeビルド時の不具合を修正

- MinGW 判定方法を変更

- cmd からでも MinGW でビルドできるようにした

- Linux(Windows以外) で MinGW でビルドするとき、誤った perl.exe を使用しないよう修正
- lang/, teraterm.chm が install されないことがあったので修正
- cmake のインデントを space にした (.editorconfig)

Change Summary

Incremental Difference

--- trunk/CMakeLists.txt (revision 8839)
+++ trunk/CMakeLists.txt (revision 8840)
@@ -110,7 +110,7 @@
110110
111111 ### tool
112112 # perl
113-if (MSVC OR ("$ENV{MSYSTEM}" MATCHES "MINGW"))
113+if (MSVC OR (MINGW AND (EXISTS "c:/windows")))
114114 find_program(
115115 PERL perl.exe
116116 HINTS ${CMAKE_CURRENT_SOURCE_DIR}/libs/perl/perl/bin
--- trunk/doc/CMakeLists.txt (revision 8839)
+++ trunk/doc/CMakeLists.txt (revision 8840)
@@ -1,4 +1,4 @@
1-if (MSVC OR ("$ENV{MSYSTEM}" MATCHES "MINGW"))
1+if (MSVC OR MINGW)
22 find_program(
33 HHC hhc.exe
44 HINTS "C:/Program Files (x86)/HTML Help Workshop"
@@ -9,6 +9,7 @@
99 else()
1010 set(HHC "HHC-NOTFOUND")
1111 endif()
12+message("hhc=${HHC}")
1213
1314 if (NOT("${PERL}" STREQUAL "PERL-NOTFOUND") AND NOT("${HHC}" STREQUAL "HHC-NOTFOUND"))
1415 file(
@@ -107,9 +108,9 @@
107108 else()
108109
109110 # chmが存在したらコピーする
110- if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/ja/teraterm.chm)
111+ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/en/teraterm.chm)
111112 install(
112- FILES ${CMAKE_CURRENT_SOURCE_DIR}/ja/teraterm.chm
113+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/en/teraterm.chm
113114 DESTINATION .
114115 )
115116 endif()
--- trunk/installer/CMakeLists.txt (revision 8839)
+++ trunk/installer/CMakeLists.txt (revision 8840)
@@ -1,18 +1,4 @@
11 
2-install(
3- DIRECTORY release/
4- DESTINATION .
5- PATTERN *~ EXCLUDE
6- PATTERN TERATERM.INI EXCLUDE
7- PATTERN lang_utf8 EXCLUDE
8- )
9-
10-install(
11- FILES release/EDITOR.CNF
12- DESTINATION .
13- RENAME KEYBOARD.CNF
14- )
15-
162 add_custom_target(
173 teraterm_ini
184 DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/TERATERM.INI
@@ -77,6 +63,8 @@
7763 PROPERTIES FOLDER installer
7864 )
7965
66+install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" --build ${CMAKE_CURRENT_BINARY_DIR} --target lang_conv)")
67+
8068 add_custom_command(
8169 OUTPUT
8270 ${RELEASE_DIR}/lang_utf16le/Default.lng
@@ -167,9 +155,9 @@
167155 "${RELEASE_DIR}/lang/Traditional Chinese.lng"
168156 )
169157 set_target_properties(
170- lang_copy
171- PROPERTIES FOLDER installer
172- )
158+ lang_copy
159+ PROPERTIES FOLDER installer
160+ )
173161 add_custom_command(
174162 OUTPUT
175163 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(Configuration)/lang/Default.lng"
@@ -237,9 +225,9 @@
237225 "${RELEASE_DIR}/lang/Traditional Chinese.lng"
238226 )
239227 set_target_properties(
240- lang_copy
241- PROPERTIES FOLDER installer
242- )
228+ lang_copy
229+ PROPERTIES FOLDER installer
230+ )
243231 add_custom_command(
244232 OUTPUT
245233 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lang/Default.lng"
@@ -264,3 +252,17 @@
264252 COMMAND ${CMAKE_COMMAND} -E copy_directory ${RELEASE_DIR}/lang_utf16le ${CMAKE_BINARY_DIR}/lang_utf16le
265253 )
266254 endif()
255+
256+install(
257+ DIRECTORY release/
258+ DESTINATION .
259+ PATTERN *~ EXCLUDE
260+ PATTERN TERATERM.INI EXCLUDE
261+ PATTERN lang_utf8 EXCLUDE
262+ )
263+
264+install(
265+ FILES release/EDITOR.CNF
266+ DESTINATION .
267+ RENAME KEYBOARD.CNF
268+ )
Show on old repository browser