Tera TermRevision: 9449
https://osdn.net/projects/ttssh2/scm/svn/commits/9449
Author: zmatsuo
Date: 2021-09-24 00:53:55 +0900 (Fri, 24 Sep 2021)
Log Message:
-----------
cmakeビルド時,cygtoolをビルド中のコンパイラを使用するようにした
- 変更前は指定していなかった
- "Visual Studio 16 2019" 固定になっていた
- ソースツリー内にビルドフォルダ作らないようにした
- 変更前は "cygtool/build" 固定だった
- .editorconfig にルール追加
- cmakeファイルの行末スペース、ファイル末の改行を削除するようにした
- msys2でビルドエラーが出ないよう修正
Modified Paths:
--------------
trunk/.editorconfig
trunk/installer/CMakeLists.txt
trunk/installer/cygtool/build_cygtool.cmake
-------------- next part --------------
Modified: trunk/.editorconfig
===================================================================
--- trunk/.editorconfig 2021-09-23 11:25:52 UTC (rev 9448)
+++ trunk/.editorconfig 2021-09-23 15:53:55 UTC (rev 9449)
@@ -47,3 +47,5 @@
charset = utf-8-bom
indent_style = space
indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
Modified: trunk/installer/CMakeLists.txt
===================================================================
--- trunk/installer/CMakeLists.txt 2021-09-23 11:25:52 UTC (rev 9448)
+++ trunk/installer/CMakeLists.txt 2021-09-23 15:53:55 UTC (rev 9449)
@@ -321,11 +321,13 @@
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/cygtool.dll
)
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cygtool_build)
+
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cygtool.dll
- COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} -P build_cygtool.cmake
+ COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_LIST_DIR}/cygtool/build_cygtool.cmake
COMMAND ${CMAKE_COMMAND} -E echo ${CMAKE_GENERATOR}
- WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/cygtool
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cygtool_build
COMMENT Generate "${CMAKE_CURRENT_BINARY_DIR}/cygtool.dll"
)
@@ -353,15 +355,16 @@
COMMAND "${ISCC}" ${ISCC_OPTION} teraterm_cmake.iss
WORKING_DIRECTORY ${CMAKE_CURRENT_BUILD_DIR}
)
+
+ set_target_properties(
+ cygtool
+ PROPERTIES FOLDER installer
+ )
endif()
set_target_properties(
inno_setup
PROPERTIES FOLDER installer
)
-set_target_properties(
- cygtool
- PROPERTIES FOLDER installer
- )
# zip
add_custom_target(
Modified: trunk/installer/cygtool/build_cygtool.cmake
===================================================================
--- trunk/installer/cygtool/build_cygtool.cmake 2021-09-23 11:25:52 UTC (rev 9448)
+++ trunk/installer/cygtool/build_cygtool.cmake 2021-09-23 15:53:55 UTC (rev 9449)
@@ -18,22 +18,16 @@
message("CMAKE_GENERATOR=${CMAKE_GENERATOR}")
message("CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
-file(REMOVE_RECURSE build)
-file(MAKE_DIRECTORY build)
-
execute_process(
- COMMAND ${CMAKE_COMMAND} .. -G ${CMAKE_GENERATOR} ${GENERATE_OPTION} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
- WORKING_DIRECTORY "build"
+ COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_LIST_DIR} -G ${CMAKE_GENERATOR} ${GENERATE_OPTION} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
)
execute_process(
COMMAND ${CMAKE_COMMAND} --build . --config release
- WORKING_DIRECTORY "build"
)
if(DEFINED CMAKE_INSTALL_PREFIX)
execute_process(
COMMAND ${CMAKE_COMMAND} --build . --config release --target install
- WORKING_DIRECTORY "build"
)
endif()