Tera TermRevision: 9670
https://osdn.net/projects/ttssh2/scm/svn/commits/9670
Author: zmatsuo
Date: 2022-01-04 00:18:05 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
cmake, msys2でビルド時にchmが作成できない場合があるので修正
- 次の時 chm が生成できない
- PATH に c:/Windows/system32/ が入っていない
- msys2時にあり得る
- msys2以外のperlを利用したとき
- perlスクリプトが system() を使用したとき cmd.exe を実行できない
Modified Paths:
--------------
trunk/doc/makechm.cmake
-------------- next part --------------
Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake 2022-01-03 15:17:55 UTC (rev 9669)
+++ trunk/doc/makechm.cmake 2022-01-03 15:18:05 UTC (rev 9670)
@@ -1,16 +1,21 @@
# cmake -P makechm.cmake
if(CMAKE_HOST_WIN32)
+ if("${CMAKE_COMMAND}" MATCHES "msys")
+ # msys
+ find_program(PERL perl.exe)
+ else()
+ find_program(
+ PERL perl.exe
+ HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/perl/perl/bin
+ HINTS c:/Strawberry/perl/bin
+ HINTS c:/Perl64/bin
+ HINTS c:/Perl/bin
+ HINTS c:/cygwin/usr/bin
+ HINTS c:/cygwin64/usr/bin
+ )
+ endif()
find_program(
- PERL perl.exe
- HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/perl/perl/bin
- HINTS c:/Strawberry/perl/bin
- HINTS c:/Perl64/bin
- HINTS c:/Perl/bin
- HINTS c:/cygwin/usr/bin
- HINTS c:/cygwin64/usr/bin
- )
- find_program(
HHC hhc.exe
HINTS "C:/Program Files (x86)/HTML Help Workshop"
HINTS "C:/Program Files/HTML Help Workshop"