Tera TermRevision: 8849
https://osdn.net/projects/ttssh2/scm/svn/commits/8849
Author: zmatsuo
Date: 2020-07-14 00:31:02 +0900 (Tue, 14 Jul 2020)
Log Message:
-----------
cmakeビルド install時に、cygtermをビルドするようにした
- cygwinがある場合はビルドする
- ない場合は install に cygterm は含まれない
Modified Paths:
--------------
trunk/installer/CMakeLists.txt
Added Paths:
-----------
trunk/installer/build_cygterm.cmake
-------------- next part --------------
Modified: trunk/installer/CMakeLists.txt
===================================================================
--- trunk/installer/CMakeLists.txt 2020-07-09 13:16:59 UTC (rev 8848)
+++ trunk/installer/CMakeLists.txt 2020-07-13 15:31:02 UTC (rev 8849)
@@ -268,21 +268,25 @@
)
# cygterm
-install(
- FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm.exe
- ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm.cfg
- ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cyglaunch.exe
- ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm+.tar.gz
- DESTINATION .
-)
-install(
- FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm.exe
- DESTINATION ./cygterm+-i686
- )
-install(
- FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm+-x86_64/cygterm.exe
- DESTINATION ./cygterm+-x86_64
- )
+if ((EXISTS "C:/cygwin64/bin") OR (EXISTS "C:/cygwin/bin"))
+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -P ${CMAKE_CURRENT_SOURCE_DIR}/build_cygterm.cmake)")
+
+ install(
+ FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm.exe
+ ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm.cfg
+ ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cyglaunch.exe
+ ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm+.tar.gz
+ DESTINATION .
+ )
+ install(
+ FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm.exe
+ DESTINATION ./cygterm+-i686
+ )
+ install(
+ FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/../cygterm/cygterm+-x86_64/cygterm.exe
+ DESTINATION ./cygterm+-x86_64
+ )
+endif()
Added: trunk/installer/build_cygterm.cmake
===================================================================
--- trunk/installer/build_cygterm.cmake (rev 0)
+++ trunk/installer/build_cygterm.cmake 2020-07-13 15:31:02 UTC (rev 8849)
@@ -0,0 +1,21 @@
+
+if(NOT DEFINED CYGWIN_PATH)
+ set(CYGWIN_PATH "C:/cygwin64/bin")
+ if (NOT EXISTS ${CYGWIN_PATH})
+ set(CYGWIN_PATH "C:/cygwin/bin")
+ if (NOT EXISTS ${CYGWIN_PATH})
+ message(FATAL_ERROR "Not found cygwin")
+ endif()
+ endif()
+endif()
+
+message("build_cygterm.cmake")
+message("CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
+message("CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
+message("CMAKE_CURRENT_LIST_DIR=${CMAKE_CURRENT_LIST_DIR}")
+message("CYGWIN_PATH=${CYGWIN_PATH}")
+set(ENV{PATH} ${CYGWIN_PATH})
+execute_process(
+ COMMAND make all
+ WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../cygterm
+ )