[ttssh2-commit] [9548] cmakeビルド,mingw 32bitでビルドエラーが出ることがあったので修正

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2021年 12月 1日 (水) 00:58:34 JST


Revision: 9548
          https://osdn.net/projects/ttssh2/scm/svn/commits/9548
Author:   zmatsuo
Date:     2021-12-01 00:58:34 +0900 (Wed, 01 Dec 2021)
Log Message:
-----------
cmakeビルド,mingw 32bitでビルドエラーが出ることがあったので修正

- SUPPORT_OLD_WINDOWS=ON 時にリンクエラーが出ていた
- 64bitビルド時に SUPPORT_OLD_WINDOWS=ON にしているとエラーが出るようにした

Modified Paths:
--------------
    trunk/TTXSamples/TTXShowCommandLine/CMakeLists.txt
    trunk/teraterm/CMakeLists.txt
    trunk/teraterm/keycode/CMakeLists.txt

-------------- next part --------------
Modified: trunk/TTXSamples/TTXShowCommandLine/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXShowCommandLine/CMakeLists.txt	2021-11-27 13:49:15 UTC (rev 9547)
+++ trunk/TTXSamples/TTXShowCommandLine/CMakeLists.txt	2021-11-30 15:58:34 UTC (rev 9548)
@@ -14,6 +14,7 @@
     ${PACKAGE_NAME}
     PRIVATE
     layer_for_unicode
+    common_static
     )
   if(MSVC)
     target_sources(
@@ -44,4 +45,3 @@
   ../../teraterm/teraterm
   ../../teraterm/common
   )
-

Modified: trunk/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/CMakeLists.txt	2021-11-27 13:49:15 UTC (rev 9547)
+++ trunk/teraterm/CMakeLists.txt	2021-11-30 15:58:34 UTC (rev 9548)
@@ -43,6 +43,8 @@
     set_target_properties(
       layer_for_unicode
       PROPERTIES FOLDER teraterm)
+  else()
+    message(FATAL_ERROR "64bit binary can not support 9x")
   endif()
 
   if(MINGW)
@@ -52,5 +54,3 @@
       PROPERTIES FOLDER teraterm)
   endif(MINGW)
 endif()
-
-

Modified: trunk/teraterm/keycode/CMakeLists.txt
===================================================================
--- trunk/teraterm/keycode/CMakeLists.txt	2021-11-27 13:49:15 UTC (rev 9547)
+++ trunk/teraterm/keycode/CMakeLists.txt	2021-11-30 15:58:34 UTC (rev 9548)
@@ -16,6 +16,7 @@
     ${PACKAGE_NAME}
     PRIVATE
     layer_for_unicode
+    common_static
     )
   if(MSVC)
     target_sources(
@@ -68,8 +69,8 @@
   target_link_libraries(
     ${PACKAGE_NAME_2}
     PRIVATE
+    layer_for_unicode
     common_static
-    layer_for_unicode
     )
   if(MSVC)
     target_sources(


ttssh2-commit メーリングリストの案内
Back to archive index