Tera TermRevision: 10517
https://osdn.net/projects/ttssh2/scm/svn/commits/10517
Author: zmatsuo
Date: 2023-01-18 23:46:19 +0900 (Wed, 18 Jan 2023)
Log Message:
-----------
cmakeビルド時、linuxではインストーラの作成は行わないよう修正
- linuxではインストーラ作成できない
Modified Paths:
--------------
trunk/installer/CMakeLists.txt
-------------- next part --------------
Modified: trunk/installer/CMakeLists.txt
===================================================================
--- trunk/installer/CMakeLists.txt 2023-01-18 13:30:24 UTC (rev 10516)
+++ trunk/installer/CMakeLists.txt 2023-01-18 14:46:19 UTC (rev 10517)
@@ -51,28 +51,35 @@
# Inno Setup
# Create setup.exe
-find_program(
- ISCC ISCC.exe
- HINTS "${CMAKE_SOURCE_DIR}/buildtools/innosetup6/bin"
- HINTS "C:/Program Files (x86)/Inno Setup 6/"
- HINTS "C:/Program Files (x86)/Inno Setup 5/"
- HINTS "C:/Program Files/Inno Setup 6/"
- HINTS "C:/Program Files/Inno Setup 5/"
- HINTS "$ENV{LOCALAPPDATA}/Programs/Inno Setup 6"
- HINTS "$ENV{LOCALAPPDATA}/Programs/Inno Setup 5"
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
+ find_program(
+ ISCC ISCC.exe
+ HINTS "${CMAKE_SOURCE_DIR}/buildtools/innosetup6/bin"
+ HINTS "C:/Program Files (x86)/Inno Setup 6/"
+ HINTS "C:/Program Files (x86)/Inno Setup 5/"
+ HINTS "C:/Program Files/Inno Setup 6/"
+ HINTS "C:/Program Files/Inno Setup 5/"
+ HINTS "$ENV{LOCALAPPDATA}/Programs/Inno Setup 6"
+ HINTS "$ENV{LOCALAPPDATA}/Programs/Inno Setup 5"
)
-message("ISCC=${ISCC}")
+ message("ISCC=${ISCC}")
+endif()
-if(NOT TARGET ttxssh)
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
add_custom_target(
inno_setup
- COMMAND "${CMAKE_COMMAND}" -E echo "ttxssh was not build"
- )
+ COMMAND "${CMAKE_COMMAND}" -E echo "inno setup do not run"
+ )
elseif("${ISCC}" STREQUAL "ISCC-NOTFOUND")
add_custom_target(
inno_setup
COMMAND "${CMAKE_COMMAND}" -E echo "inno setup not found"
- )
+ )
+elseif(NOT TARGET ttxssh)
+ add_custom_target(
+ inno_setup
+ COMMAND "${CMAKE_COMMAND}" -E echo "ttxssh was not build"
+ )
else()
configure_file(
teraterm_cmake.iss.in teraterm_cmake.iss