Tera TermRevision: 10541
https://osdn.net/projects/ttssh2/scm/svn/commits/10541
Author: zmatsuo
Date: 2023-01-29 00:26:13 +0900 (Sun, 29 Jan 2023)
Log Message:
-----------
cmakeビルド用 svnversion.h 移動修正
- svnversion.h 等を生成するスクリプト svnrev.cmake 追加
- svnversion.h は ビルドフォルダの teraterm/common/ に移動
- 修正前はビルドフォルダの teraterm/ttpdlg だった
- cmake時 teraterm/common/ の include 指定を修正
- common/CMakeLists.txt の target_include_directories(PUBLIC) を利用
- 各々の CMakeLists.txt の common への include を削除した
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/TTProxy/CMakeLists.txt
trunk/TTXAdditional/CMakeLists_sample.txt
trunk/TTXKanjiMenu/CMakeLists.txt
trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt
trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt
trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt
trunk/TTXSamples/TTXViewMode/CMakeLists.txt
trunk/TTXSamples/TTXttyrec/CMakeLists.txt
trunk/teraterm/common/CMakeLists.txt
trunk/teraterm/keycode/CMakeLists.txt
trunk/teraterm/teraterm/CMakeLists.txt
trunk/teraterm/ttpcmn/CMakeLists.txt
trunk/teraterm/ttpmacro/CMakeLists.txt
trunk/teraterm/ttptek/CMakeLists.txt
trunk/tools/lscom/CMakeLists.txt
trunk/tools/ttbroadcast/CMakeLists.txt
trunk/ttpmenu/CMakeLists.txt
trunk/ttssh2/ttxssh/CMakeLists.txt
Added Paths:
-----------
trunk/buildtools/svnrev/svnrev.cmake
-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -150,14 +150,18 @@
if(EXISTS "${CMAKE_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
file(REMOVE "${CMAKE_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
endif()
+if(EXISTS "${CMAKE_SOURCE_DIR}/teraterm/common/svnversion.h")
+ file(REMOVE "${CMAKE_SOURCE_DIR}/teraterm/common/svnversion.h")
+endif()
-if(NOT EXISTS "${CMAKE_BINARY_DIR}/build_config.cmake")
- file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/teraterm/ttpdlg)
+if((NOT EXISTS "${CMAKE_BINARY_DIR}/build_config.cmake") OR
+ (NOT EXISTS "${CMAKE_BINARY_DIR}/teraterm/common/svnversion.h") OR
+ (NOT EXISTS "${CMAKE_SOURCE_DIR}/buildtools/svnrev/sourcetreeinfo.bat"))
execute_process(
- COMMAND ${PERL} svnrev.pl --svn "${Subversion_SVN_EXECUTABLE}" --git "${GIT_EXECUTABLE}" --root ${CMAKE_SOURCE_DIR} --header ${CMAKE_BINARY_DIR}/teraterm/ttpdlg/svnversion.h --cmake ${CMAKE_BINARY_DIR}/build_config.cmake
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/buildtools/svnrev
+ COMMAND ${CMAKE_COMMAND} -DPERL=${PERL} -DSOURCE_DIR=${CMAKE_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DSVN_EXECUTABLE=${Subversion_SVN_EXECUTABLE} -P svnrev.cmake
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/buildtools/svnrev
RESULT_VARIABLE rv
- )
+ )
if(NOT rv STREQUAL "0")
message(FATAL_ERROR "execute error ${PERL}")
endif()
Modified: trunk/TTProxy/CMakeLists.txt
===================================================================
--- trunk/TTProxy/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/TTProxy/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -105,7 +105,6 @@
${PACKAGE_NAME}
PRIVATE
../teraterm/teraterm
- ../teraterm/common
YCL/include
.
)
Modified: trunk/TTXAdditional/CMakeLists_sample.txt
===================================================================
--- trunk/TTXAdditional/CMakeLists_sample.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/TTXAdditional/CMakeLists_sample.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -40,7 +40,12 @@
${PACKAGE_NAME}
PRIVATE
../teraterm/teraterm
- ../teraterm/common
)
+target_link_libraries(
+ ${PACKAGE_NAME}
+ PRIVATE
+ common_static
+ )
+
set_target_properties(${PACKAGE_NAME} PROPERTIES FOLDER TTXAdditional)
Modified: trunk/TTXKanjiMenu/CMakeLists.txt
===================================================================
--- trunk/TTXKanjiMenu/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/TTXKanjiMenu/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -42,7 +42,6 @@
${PACKAGE_NAME}
PRIVATE
../teraterm/teraterm
- ../teraterm/common
)
target_link_libraries(
Modified: trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -42,7 +42,6 @@
${PACKAGE_NAME}
PRIVATE
../../teraterm/teraterm
- ../../teraterm/common
)
target_link_libraries(
@@ -51,4 +50,3 @@
ttpcmn
common_static
)
-
Modified: trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -16,7 +16,7 @@
../../teraterm/common/codeconv.h
../../teraterm/common/dlglib.h
../../teraterm/common/getcontent.h
- ${CMAKE_CURRENT_BINARY_DIR}/../../teraterm/ttpdlg/svnversion.h
+ ${CMAKE_CURRENT_BINARY_DIR}/../../teraterm/common/svnversion.h
)
if(SUPPORT_OLD_WINDOWS)
@@ -80,10 +80,8 @@
target_include_directories(
${PACKAGE_NAME}
PRIVATE
- ${CMAKE_CURRENT_BINARY_DIR}/../../teraterm/ttpdlg # for svnversion.h
../../libs/cJSON
../../teraterm/teraterm
- ../../teraterm/common
)
target_link_libraries(
Modified: trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -52,7 +52,6 @@
${PACKAGE_NAME}
PRIVATE
../../teraterm/teraterm
- ../../teraterm/common
)
target_link_libraries(
Modified: trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -49,7 +49,6 @@
${PACKAGE_NAME}
PRIVATE
../../teraterm/teraterm
- ../../teraterm/common
)
target_link_libraries(
Modified: trunk/TTXSamples/TTXViewMode/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXViewMode/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/TTXSamples/TTXViewMode/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -59,7 +59,6 @@
${PACKAGE_NAME}
PRIVATE
../../teraterm/teraterm
- ../../teraterm/common
)
target_link_libraries(
Modified: trunk/TTXSamples/TTXttyrec/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXttyrec/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/TTXSamples/TTXttyrec/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -42,7 +42,6 @@
TTXttyplay
PRIVATE
../../teraterm/teraterm
- ../../teraterm/common
)
target_link_libraries(
@@ -96,7 +95,6 @@
TTXttyrec
PRIVATE
../../teraterm/teraterm
- ../../teraterm/common
)
target_link_libraries(
Added: trunk/buildtools/svnrev/svnrev.cmake
===================================================================
--- trunk/buildtools/svnrev/svnrev.cmake (rev 0)
+++ trunk/buildtools/svnrev/svnrev.cmake 2023-01-28 15:26:13 UTC (rev 10541)
@@ -0,0 +1,47 @@
+# input
+# PERL
+# GIT_EXECUTABLE
+# SVN_EXECUTABLE
+# SOURCE_DIR (CMAKE_SOURCE_DIR), ソースツリーのルート
+# BINARY_DIR (CMAKE_BINARY_DIR), バイナリツリーのルート
+
+set(CMAKE_SOURCE_DIR ${SOURCE_DIR})
+set(CMAKE_BINARY_DIR ${BINARY_DIR})
+set(SVNREV_PL ${CMAKE_CURRENT_LIST_DIR}/svnrev.pl)
+set(SVNVERSION_H ${CMAKE_BINARY_DIR}/teraterm/common/svnversion.h)
+set(BUILD_CONFIG ${CMAKE_BINARY_DIR}/build_config.cmake)
+set(SOURCETREEINFO ${CMAKE_CURRENT_LIST_DIR}/sourcetree_info.bat)
+
+unset(ARGS)
+if((DEFINED SVN_EXECUTABLE) AND (DEFINED ${SVN_EXECUTABLE}))
+ list(APPEND ARGS "--svn" "${SVN_EXECUTABLE}")
+endif()
+if((DEFINED GIT_EXECUTABLE) AND (DEFINED ${GIT_EXECUTABLE}))
+ list(APPEND ARGS "--git" "${GIT_EXECUTABLE}")
+endif()
+
+if(0)
+ message("PERL=${PERL}")
+ message("GIT_EXECUTABLE=${GIT_EXECUTABLE}")
+ message("SVN_EXECUTABLE=${SVN_EXECUTABLE}")
+ message("SOURCE_DIR=${SOURCE_DIR}")
+ message("BINARY_DIR=${BINARY_DIR}")
+ message("CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
+ message("CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}")
+ message("ARGS=${ARGS}")
+ message("SVNREV_PL=${SVNREV_PL}")
+ message("SVNVERSION_H=${SVNVERSION_H}")
+ message("BUILD_CONFIG=${BUILD_CONFIG}")
+ message("SOURCETREEINFO=${SOURCETREEINFO}")
+endif()
+
+execute_process(
+ COMMAND ${PERL} ${SVNREV_PL} ${ARGS}
+ --root ${CMAKE_SOURCE_DIR}
+ --header ${SVNVERSION_H}
+ --cmake ${BUILD_CONFIG}
+ --bat ${SOURCETREEINFO}
+ #--verbose
+ WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+ RESULT_VARIABLE rv
+)
Modified: trunk/teraterm/common/CMakeLists.txt
===================================================================
--- trunk/teraterm/common/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/teraterm/common/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -57,8 +57,9 @@
target_include_directories(
${PACKAGE_NAME}
PUBLIC
+ ${CMAKE_CURRENT_BINARY_DIR} # for svnversion.h
.
- )
+)
target_link_libraries(
${PACKAGE_NAME}
Modified: trunk/teraterm/keycode/CMakeLists.txt
===================================================================
--- trunk/teraterm/keycode/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/teraterm/keycode/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -39,12 +39,6 @@
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/"
)
-target_include_directories(
- ${PACKAGE_NAME}
- PRIVATE
- ../common
- )
-
if(MSVC)
target_compile_options(
${PACKAGE_NAME}
@@ -105,12 +99,6 @@
UNICODE _UNICODE
)
-target_include_directories(
- ${PACKAGE_NAME_2}
- PRIVATE
- ../common
- )
-
if(MSVC)
target_compile_options(
${PACKAGE_NAME_2}
Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/teraterm/teraterm/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -103,7 +103,7 @@
tt-version.rc
teraterm_manifest.rc
#
- ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg/svnversion.h
+ ${CMAKE_CURRENT_BINARY_DIR}/../common/svnversion.h
#
unicode_test.h
unicode.h
@@ -293,13 +293,11 @@
PRIVATE
.
../teraterm
- ../common
../ttpfile
../ttpdlg
../ttpcmn
../susie_plugin
${ONIGURUMA_INCLUDE_DIRS}
- ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg # for svnversion.h
${SFMT_INCLUDE_DIRS}
)
Modified: trunk/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpcmn/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/teraterm/ttpcmn/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -95,7 +95,6 @@
target_include_directories(
${PACKAGE_NAME}
PRIVATE
- ../common
../ttpfile
.
)
Modified: trunk/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpmacro/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/teraterm/ttpmacro/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -93,7 +93,6 @@
target_include_directories(
${PACKAGE_NAME}
PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/../common
${ONIGURUMA_INCLUDE_DIRS}
${SFMT_INCLUDE_DIRS}
)
Modified: trunk/teraterm/ttptek/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttptek/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/teraterm/ttptek/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -54,7 +54,6 @@
target_include_directories(
${PACKAGE_NAME}
PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/../common
)
if(MINGW)
Modified: trunk/tools/lscom/CMakeLists.txt
===================================================================
--- trunk/tools/lscom/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/tools/lscom/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -19,7 +19,6 @@
target_include_directories(
${PACKAGE_NAME}
PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/../../teraterm/common
${CMAKE_CURRENT_SOURCE_DIR}/../../teraterm/ttpcmn
${CMAKE_CURRENT_SOURCE_DIR}/../libs/getopt_mb_uni_src
)
@@ -34,9 +33,7 @@
${PACKAGE_NAME}
PRIVATE
common_static
- #
- #setupapi
- )
+)
if(SUPPORT_OLD_WINDOWS)
if(MSVC)
Modified: trunk/tools/ttbroadcast/CMakeLists.txt
===================================================================
--- trunk/tools/ttbroadcast/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/tools/ttbroadcast/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -17,7 +17,6 @@
target_include_directories(
${PACKAGE_NAME}
PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/../../teraterm/common
${CMAKE_CURRENT_SOURCE_DIR}/../libs/getopt_mb_uni_src
)
Modified: trunk/ttpmenu/CMakeLists.txt
===================================================================
--- trunk/ttpmenu/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/ttpmenu/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -57,7 +57,6 @@
target_include_directories(
${PACKAGE_NAME}
PRIVATE
- ../teraterm/common
.
)
Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt 2023-01-28 15:26:00 UTC (rev 10540)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt 2023-01-28 15:26:13 UTC (rev 10541)
@@ -163,7 +163,6 @@
${PACKAGE_NAME}
PRIVATE
../../teraterm/teraterm
- ../../teraterm/common
../matcher
../putty
../../libs/include