OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision10541 (tree)
Time2023-01-29 00:26:13
Authorzmatsuo

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 を削除した

Change Summary

Incremental Difference

--- trunk/CMakeLists.txt (revision 10540)
+++ trunk/CMakeLists.txt (revision 10541)
@@ -150,14 +150,18 @@
150150 if(EXISTS "${CMAKE_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
151151 file(REMOVE "${CMAKE_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
152152 endif()
153+if(EXISTS "${CMAKE_SOURCE_DIR}/teraterm/common/svnversion.h")
154+ file(REMOVE "${CMAKE_SOURCE_DIR}/teraterm/common/svnversion.h")
155+endif()
153156
154-if(NOT EXISTS "${CMAKE_BINARY_DIR}/build_config.cmake")
155- file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/teraterm/ttpdlg)
157+if((NOT EXISTS "${CMAKE_BINARY_DIR}/build_config.cmake") OR
158+ (NOT EXISTS "${CMAKE_BINARY_DIR}/teraterm/common/svnversion.h") OR
159+ (NOT EXISTS "${CMAKE_SOURCE_DIR}/buildtools/svnrev/sourcetreeinfo.bat"))
156160 execute_process(
157- 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
158- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/buildtools/svnrev
161+ 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
162+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/buildtools/svnrev
159163 RESULT_VARIABLE rv
160- )
164+ )
161165 if(NOT rv STREQUAL "0")
162166 message(FATAL_ERROR "execute error ${PERL}")
163167 endif()
--- trunk/TTProxy/CMakeLists.txt (revision 10540)
+++ trunk/TTProxy/CMakeLists.txt (revision 10541)
@@ -105,7 +105,6 @@
105105 ${PACKAGE_NAME}
106106 PRIVATE
107107 ../teraterm/teraterm
108- ../teraterm/common
109108 YCL/include
110109 .
111110 )
--- trunk/TTXAdditional/CMakeLists_sample.txt (revision 10540)
+++ trunk/TTXAdditional/CMakeLists_sample.txt (revision 10541)
@@ -40,7 +40,12 @@
4040 ${PACKAGE_NAME}
4141 PRIVATE
4242 ../teraterm/teraterm
43- ../teraterm/common
4443 )
4544
45+target_link_libraries(
46+ ${PACKAGE_NAME}
47+ PRIVATE
48+ common_static
49+ )
50+
4651 set_target_properties(${PACKAGE_NAME} PROPERTIES FOLDER TTXAdditional)
--- trunk/TTXKanjiMenu/CMakeLists.txt (revision 10540)
+++ trunk/TTXKanjiMenu/CMakeLists.txt (revision 10541)
@@ -42,7 +42,6 @@
4242 ${PACKAGE_NAME}
4343 PRIVATE
4444 ../teraterm/teraterm
45- ../teraterm/common
4645 )
4746
4847 target_link_libraries(
--- trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt (revision 10540)
+++ trunk/TTXSamples/TTXAdditionalTitle/CMakeLists.txt (revision 10541)
@@ -42,7 +42,6 @@
4242 ${PACKAGE_NAME}
4343 PRIVATE
4444 ../../teraterm/teraterm
45- ../../teraterm/common
4645 )
4746
4847 target_link_libraries(
@@ -51,4 +50,3 @@
5150 ttpcmn
5251 common_static
5352 )
54-
--- trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt (revision 10540)
+++ trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt (revision 10541)
@@ -16,7 +16,7 @@
1616 ../../teraterm/common/codeconv.h
1717 ../../teraterm/common/dlglib.h
1818 ../../teraterm/common/getcontent.h
19- ${CMAKE_CURRENT_BINARY_DIR}/../../teraterm/ttpdlg/svnversion.h
19+ ${CMAKE_CURRENT_BINARY_DIR}/../../teraterm/common/svnversion.h
2020 )
2121
2222 if(SUPPORT_OLD_WINDOWS)
@@ -80,10 +80,8 @@
8080 target_include_directories(
8181 ${PACKAGE_NAME}
8282 PRIVATE
83- ${CMAKE_CURRENT_BINARY_DIR}/../../teraterm/ttpdlg # for svnversion.h
8483 ../../libs/cJSON
8584 ../../teraterm/teraterm
86- ../../teraterm/common
8785 )
8886
8987 target_link_libraries(
--- trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt (revision 10540)
+++ trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt (revision 10541)
@@ -52,7 +52,6 @@
5252 ${PACKAGE_NAME}
5353 PRIVATE
5454 ../../teraterm/teraterm
55- ../../teraterm/common
5655 )
5756
5857 target_link_libraries(
--- trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt (revision 10540)
+++ trunk/TTXSamples/TTXResizeMenu/CMakeLists.txt (revision 10541)
@@ -49,7 +49,6 @@
4949 ${PACKAGE_NAME}
5050 PRIVATE
5151 ../../teraterm/teraterm
52- ../../teraterm/common
5352 )
5453
5554 target_link_libraries(
--- trunk/TTXSamples/TTXViewMode/CMakeLists.txt (revision 10540)
+++ trunk/TTXSamples/TTXViewMode/CMakeLists.txt (revision 10541)
@@ -59,7 +59,6 @@
5959 ${PACKAGE_NAME}
6060 PRIVATE
6161 ../../teraterm/teraterm
62- ../../teraterm/common
6362 )
6463
6564 target_link_libraries(
--- trunk/TTXSamples/TTXttyrec/CMakeLists.txt (revision 10540)
+++ trunk/TTXSamples/TTXttyrec/CMakeLists.txt (revision 10541)
@@ -42,7 +42,6 @@
4242 TTXttyplay
4343 PRIVATE
4444 ../../teraterm/teraterm
45- ../../teraterm/common
4645 )
4746
4847 target_link_libraries(
@@ -96,7 +95,6 @@
9695 TTXttyrec
9796 PRIVATE
9897 ../../teraterm/teraterm
99- ../../teraterm/common
10098 )
10199
102100 target_link_libraries(
--- trunk/teraterm/common/CMakeLists.txt (revision 10540)
+++ trunk/teraterm/common/CMakeLists.txt (revision 10541)
@@ -57,8 +57,9 @@
5757 target_include_directories(
5858 ${PACKAGE_NAME}
5959 PUBLIC
60+ ${CMAKE_CURRENT_BINARY_DIR} # for svnversion.h
6061 .
61- )
62+)
6263
6364 target_link_libraries(
6465 ${PACKAGE_NAME}
--- trunk/teraterm/keycode/CMakeLists.txt (revision 10540)
+++ trunk/teraterm/keycode/CMakeLists.txt (revision 10541)
@@ -39,12 +39,6 @@
3939 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/"
4040 )
4141
42-target_include_directories(
43- ${PACKAGE_NAME}
44- PRIVATE
45- ../common
46- )
47-
4842 if(MSVC)
4943 target_compile_options(
5044 ${PACKAGE_NAME}
@@ -105,12 +99,6 @@
10599 UNICODE _UNICODE
106100 )
107101
108-target_include_directories(
109- ${PACKAGE_NAME_2}
110- PRIVATE
111- ../common
112- )
113-
114102 if(MSVC)
115103 target_compile_options(
116104 ${PACKAGE_NAME_2}
--- trunk/teraterm/teraterm/CMakeLists.txt (revision 10540)
+++ trunk/teraterm/teraterm/CMakeLists.txt (revision 10541)
@@ -103,7 +103,7 @@
103103 tt-version.rc
104104 teraterm_manifest.rc
105105 #
106- ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg/svnversion.h
106+ ${CMAKE_CURRENT_BINARY_DIR}/../common/svnversion.h
107107 #
108108 unicode_test.h
109109 unicode.h
@@ -293,13 +293,11 @@
293293 PRIVATE
294294 .
295295 ../teraterm
296- ../common
297296 ../ttpfile
298297 ../ttpdlg
299298 ../ttpcmn
300299 ../susie_plugin
301300 ${ONIGURUMA_INCLUDE_DIRS}
302- ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg # for svnversion.h
303301 ${SFMT_INCLUDE_DIRS}
304302 )
305303
--- trunk/teraterm/ttpcmn/CMakeLists.txt (revision 10540)
+++ trunk/teraterm/ttpcmn/CMakeLists.txt (revision 10541)
@@ -95,7 +95,6 @@
9595 target_include_directories(
9696 ${PACKAGE_NAME}
9797 PRIVATE
98- ../common
9998 ../ttpfile
10099 .
101100 )
--- trunk/teraterm/ttpmacro/CMakeLists.txt (revision 10540)
+++ trunk/teraterm/ttpmacro/CMakeLists.txt (revision 10541)
@@ -93,7 +93,6 @@
9393 target_include_directories(
9494 ${PACKAGE_NAME}
9595 PRIVATE
96- ${CMAKE_CURRENT_SOURCE_DIR}/../common
9796 ${ONIGURUMA_INCLUDE_DIRS}
9897 ${SFMT_INCLUDE_DIRS}
9998 )
--- trunk/teraterm/ttptek/CMakeLists.txt (revision 10540)
+++ trunk/teraterm/ttptek/CMakeLists.txt (revision 10541)
@@ -54,7 +54,6 @@
5454 target_include_directories(
5555 ${PACKAGE_NAME}
5656 PRIVATE
57- ${CMAKE_CURRENT_SOURCE_DIR}/../common
5857 )
5958
6059 if(MINGW)
--- trunk/tools/lscom/CMakeLists.txt (revision 10540)
+++ trunk/tools/lscom/CMakeLists.txt (revision 10541)
@@ -19,7 +19,6 @@
1919 target_include_directories(
2020 ${PACKAGE_NAME}
2121 PRIVATE
22- ${CMAKE_CURRENT_SOURCE_DIR}/../../teraterm/common
2322 ${CMAKE_CURRENT_SOURCE_DIR}/../../teraterm/ttpcmn
2423 ${CMAKE_CURRENT_SOURCE_DIR}/../libs/getopt_mb_uni_src
2524 )
@@ -34,9 +33,7 @@
3433 ${PACKAGE_NAME}
3534 PRIVATE
3635 common_static
37- #
38- #setupapi
39- )
36+)
4037
4138 if(SUPPORT_OLD_WINDOWS)
4239 if(MSVC)
--- trunk/tools/ttbroadcast/CMakeLists.txt (revision 10540)
+++ trunk/tools/ttbroadcast/CMakeLists.txt (revision 10541)
@@ -17,7 +17,6 @@
1717 target_include_directories(
1818 ${PACKAGE_NAME}
1919 PRIVATE
20- ${CMAKE_CURRENT_SOURCE_DIR}/../../teraterm/common
2120 ${CMAKE_CURRENT_SOURCE_DIR}/../libs/getopt_mb_uni_src
2221 )
2322
--- trunk/ttpmenu/CMakeLists.txt (revision 10540)
+++ trunk/ttpmenu/CMakeLists.txt (revision 10541)
@@ -57,7 +57,6 @@
5757 target_include_directories(
5858 ${PACKAGE_NAME}
5959 PRIVATE
60- ../teraterm/common
6160 .
6261 )
6362
--- trunk/ttssh2/ttxssh/CMakeLists.txt (revision 10540)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt (revision 10541)
@@ -163,7 +163,6 @@
163163 ${PACKAGE_NAME}
164164 PRIVATE
165165 ../../teraterm/teraterm
166- ../../teraterm/common
167166 ../matcher
168167 ../putty
169168 ../../libs/include
Show on old repository browser