Tera TermRevision: 8840
https://osdn.net/projects/ttssh2/scm/svn/commits/8840
Author: zmatsuo
Date: 2020-07-06 22:53:51 +0900 (Mon, 06 Jul 2020)
Log Message:
-----------
cmakeビルド時の不具合を修正
- MinGW 判定方法を変更
- cmd からでも MinGW でビルドできるようにした
- Linux(Windows以外) で MinGW でビルドするとき、誤った perl.exe を使用しないよう修正
- lang/, teraterm.chm が install されないことがあったので修正
- cmake のインデントを space にした (.editorconfig)
Modified Paths:
--------------
trunk/.editorconfig
trunk/CMakeLists.txt
trunk/doc/CMakeLists.txt
trunk/installer/CMakeLists.txt
-------------- next part --------------
Modified: trunk/.editorconfig
===================================================================
--- trunk/.editorconfig 2020-07-05 23:44:48 UTC (rev 8839)
+++ trunk/.editorconfig 2020-07-06 13:53:51 UTC (rev 8840)
@@ -16,11 +16,14 @@
[*.md]
end_of_line = crlf
charset = utf-8-bom
+indent_style = space
[CMakeLists.txt]
end_of_line = crlf
charset = utf-8-bom
+indent_style = space
[*.cmake]
end_of_line = crlf
charset = utf-8-bom
+indent_style = space
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2020-07-05 23:44:48 UTC (rev 8839)
+++ trunk/CMakeLists.txt 2020-07-06 13:53:51 UTC (rev 8840)
@@ -110,7 +110,7 @@
### tool
# perl
-if (MSVC OR ("$ENV{MSYSTEM}" MATCHES "MINGW"))
+if (MSVC OR (MINGW AND (EXISTS "c:/windows")))
find_program(
PERL perl.exe
HINTS ${CMAKE_CURRENT_SOURCE_DIR}/libs/perl/perl/bin
Modified: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt 2020-07-05 23:44:48 UTC (rev 8839)
+++ trunk/doc/CMakeLists.txt 2020-07-06 13:53:51 UTC (rev 8840)
@@ -1,4 +1,4 @@
-if (MSVC OR ("$ENV{MSYSTEM}" MATCHES "MINGW"))
+if (MSVC OR MINGW)
find_program(
HHC hhc.exe
HINTS "C:/Program Files (x86)/HTML Help Workshop"
@@ -9,6 +9,7 @@
else()
set(HHC "HHC-NOTFOUND")
endif()
+message("hhc=${HHC}")
if (NOT("${PERL}" STREQUAL "PERL-NOTFOUND") AND NOT("${HHC}" STREQUAL "HHC-NOTFOUND"))
file(
@@ -107,9 +108,9 @@
else()
# chmが存在したらコピーする
- if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/ja/teraterm.chm)
+ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/en/teraterm.chm)
install(
- FILES ${CMAKE_CURRENT_SOURCE_DIR}/ja/teraterm.chm
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/en/teraterm.chm
DESTINATION .
)
endif()
Modified: trunk/installer/CMakeLists.txt
===================================================================
--- trunk/installer/CMakeLists.txt 2020-07-05 23:44:48 UTC (rev 8839)
+++ trunk/installer/CMakeLists.txt 2020-07-06 13:53:51 UTC (rev 8840)
@@ -1,18 +1,4 @@
-install(
- DIRECTORY release/
- DESTINATION .
- PATTERN *~ EXCLUDE
- PATTERN TERATERM.INI EXCLUDE
- PATTERN lang_utf8 EXCLUDE
- )
-
-install(
- FILES release/EDITOR.CNF
- DESTINATION .
- RENAME KEYBOARD.CNF
- )
-
add_custom_target(
teraterm_ini
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/TERATERM.INI
@@ -77,6 +63,8 @@
PROPERTIES FOLDER installer
)
+install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" --build ${CMAKE_CURRENT_BINARY_DIR} --target lang_conv)")
+
add_custom_command(
OUTPUT
${RELEASE_DIR}/lang_utf16le/Default.lng
@@ -167,9 +155,9 @@
"${RELEASE_DIR}/lang/Traditional Chinese.lng"
)
set_target_properties(
- lang_copy
- PROPERTIES FOLDER installer
- )
+ lang_copy
+ PROPERTIES FOLDER installer
+ )
add_custom_command(
OUTPUT
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(Configuration)/lang/Default.lng"
@@ -237,9 +225,9 @@
"${RELEASE_DIR}/lang/Traditional Chinese.lng"
)
set_target_properties(
- lang_copy
- PROPERTIES FOLDER installer
- )
+ lang_copy
+ PROPERTIES FOLDER installer
+ )
add_custom_command(
OUTPUT
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lang/Default.lng"
@@ -264,3 +252,17 @@
COMMAND ${CMAKE_COMMAND} -E copy_directory ${RELEASE_DIR}/lang_utf16le ${CMAKE_BINARY_DIR}/lang_utf16le
)
endif()
+
+install(
+ DIRECTORY release/
+ DESTINATION .
+ PATTERN *~ EXCLUDE
+ PATTERN TERATERM.INI EXCLUDE
+ PATTERN lang_utf8 EXCLUDE
+ )
+
+install(
+ FILES release/EDITOR.CNF
+ DESTINATION .
+ RENAME KEYBOARD.CNF
+ )