Tera TermRevision: 9452
https://osdn.net/projects/ttssh2/scm/svn/commits/9452
Author: zmatsuo
Date: 2021-09-25 01:46:52 +0900 (Sat, 25 Sep 2021)
Log Message:
-----------
cygtoolをビルドするとき TOOLCHAIN_FILE を継承するようにした
- linuxでビルドするとき対策
Modified Paths:
--------------
trunk/installer/CMakeLists.txt
trunk/installer/cygtool/build_cygtool.cmake
-------------- next part --------------
Modified: trunk/installer/CMakeLists.txt
===================================================================
--- trunk/installer/CMakeLists.txt 2021-09-23 15:54:18 UTC (rev 9451)
+++ trunk/installer/CMakeLists.txt 2021-09-24 16:46:52 UTC (rev 9452)
@@ -320,7 +320,7 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cygtool.dll
- 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} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -P ${CMAKE_CURRENT_LIST_DIR}/cygtool/build_cygtool.cmake
COMMAND ${CMAKE_COMMAND} -E echo ${CMAKE_GENERATOR}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cygtool_build
COMMENT Generate "${CMAKE_CURRENT_BINARY_DIR}/cygtool.dll"
Modified: trunk/installer/cygtool/build_cygtool.cmake
===================================================================
--- trunk/installer/cygtool/build_cygtool.cmake 2021-09-23 15:54:18 UTC (rev 9451)
+++ trunk/installer/cygtool/build_cygtool.cmake 2021-09-24 16:46:52 UTC (rev 9452)
@@ -17,9 +17,10 @@
message("CMAKE_GENERATOR=${CMAKE_GENERATOR}")
message("CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+message("CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
execute_process(
- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_LIST_DIR} -G ${CMAKE_GENERATOR} ${GENERATE_OPTION} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+ COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_LIST_DIR} -G ${CMAKE_GENERATOR} ${GENERATE_OPTION} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
)
execute_process(