Tera TermRevision: 10778
https://osdn.net/projects/ttssh2/scm/svn/commits/10778
Author: zmatsuo
Date: 2023-06-24 01:07:53 +0900 (Sat, 24 Jun 2023)
Log Message:
-----------
cmake 3.11 でビルドできるように修正
- VS2005でビルドするため
- 3.11 では target_link_options() が使用できない
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/teraterm/teraterm/CMakeLists.txt
trunk/ttpmenu/CMakeLists.txt
-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2023-06-21 15:09:06 UTC (rev 10777)
+++ trunk/CMakeLists.txt 2023-06-23 16:07:53 UTC (rev 10778)
@@ -52,6 +52,7 @@
endif()
endif()
if(${BMP_ICO})
+ # cmake 3.11でうまく設定されない?→手で設定する
set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} /DBMP_ICO")
endif()
Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt 2023-06-21 15:09:06 UTC (rev 10777)
+++ trunk/teraterm/teraterm/CMakeLists.txt 2023-06-23 16:07:53 UTC (rev 10778)
@@ -280,7 +280,14 @@
endif(SUPPORT_OLD_WINDOWS)
if (MSVC)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+ if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+ else()
+ target_link_options(
+ ${PACKAGE_NAME}
+ PRIVATE
+ /MANIFEST:NO)
+ endif()
endif()
set_target_properties(
Modified: trunk/ttpmenu/CMakeLists.txt
===================================================================
--- trunk/ttpmenu/CMakeLists.txt 2023-06-21 15:09:06 UTC (rev 10777)
+++ trunk/ttpmenu/CMakeLists.txt 2023-06-23 16:07:53 UTC (rev 10778)
@@ -67,10 +67,14 @@
)
if(MSVC)
- target_link_options(
- ${PACKAGE_NAME}
- PRIVATE
- /MANIFEST:NO)
+ if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+ else()
+ target_link_options(
+ ${PACKAGE_NAME}
+ PRIVATE
+ /MANIFEST:NO)
+ endif()
endif()
target_link_libraries(