Tera TermRevision: 9419
https://osdn.net/projects/ttssh2/scm/svn/commits/9419
Author: zmatsuo
Date: 2021-09-14 00:19:56 +0900 (Tue, 14 Sep 2021)
Log Message:
-----------
cmakeビルドでVisual Studio 2022 でビルドできるよう調整
Modified Paths:
--------------
trunk/libs/buildall.cmake
trunk/libs/openssl11.cmake
trunk/libs/script_support.cmake
-------------- next part --------------
Modified: trunk/libs/buildall.cmake
===================================================================
--- trunk/libs/buildall.cmake 2021-09-13 15:19:49 UTC (rev 9418)
+++ trunk/libs/buildall.cmake 2021-09-13 15:19:56 UTC (rev 9419)
@@ -1,4 +1,5 @@
-# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildall.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 17 2022" -DARCHITECTURE=Win32 -P buildall.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildall.cmake
# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=x64 -P buildall.cmake
# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildall.cmake
# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -P buildall.cmake
Modified: trunk/libs/openssl11.cmake
===================================================================
--- trunk/libs/openssl11.cmake 2021-09-13 15:19:49 UTC (rev 9418)
+++ trunk/libs/openssl11.cmake 2021-09-13 15:19:56 UTC (rev 9419)
@@ -194,6 +194,14 @@
(${CMAKE_GENERATOR} MATCHES "NMake Makefiles"))
######################################## VS
if(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
+ find_program(
+ VCVARS32 vcvarsall.bat
+ HINTS "C:/Program Files/Microsoft Visual Studio/2022/Preview/VC/Auxiliary/Build"
+ HINTS "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build"
+ HINTS "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Auxiliary/Build"
+ HINTS "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build"
+ )
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
find_program(
VCVARS32 vcvarsall.bat
@@ -275,7 +283,7 @@
"set LIB=%SDK%\\lib;%LIB%\n"
)
endif()
- if(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
+ if((${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019") OR ${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
if("${ARCHITECTURE}" MATCHES "x64")
file(APPEND "${SRC_DIR}/build_cmake.bat"
"call \"${VCVARS32_N}\" amd64\n"
Modified: trunk/libs/script_support.cmake
===================================================================
--- trunk/libs/script_support.cmake 2021-09-13 15:19:49 UTC (rev 9418)
+++ trunk/libs/script_support.cmake 2021-09-13 15:19:56 UTC (rev 9419)
@@ -1,33 +1,35 @@
-# TOOLSET ツールセット名
+# TOOLSET ツールセット名
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
- if(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
- set(MSVC_TOOLSET_VERSION 142)
+ if(${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
+ set(MSVC_TOOLSET_VERSION 143)
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
+ set(MSVC_TOOLSET_VERSION 142)
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
- set(MSVC_TOOLSET_VERSION 141)
+ set(MSVC_TOOLSET_VERSION 141)
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 14 2015")
- set(MSVC_TOOLSET_VERSION 140)
+ set(MSVC_TOOLSET_VERSION 140)
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 12 2013")
- set(MSVC_TOOLSET_VERSION 120)
+ set(MSVC_TOOLSET_VERSION 120)
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 11 2012")
- set(MSVC_TOOLSET_VERSION 110)
+ set(MSVC_TOOLSET_VERSION 110)
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 10 2010")
- set(MSVC_TOOLSET_VERSION 100)
+ set(MSVC_TOOLSET_VERSION 100)
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
- set(MSVC_TOOLSET_VERSION 90)
+ set(MSVC_TOOLSET_VERSION 90)
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
- set(MSVC_TOOLSET_VERSION 80)
+ set(MSVC_TOOLSET_VERSION 80)
else()
- set(MSVC_TOOLSET_VERSION "Unknown")
- message(FATAL_ERROR "unknown Visual Studio ${CMAKE_GENERATOR}")
+ set(MSVC_TOOLSET_VERSION "Unknown")
+ message(FATAL_ERROR "unknown Visual Studio ${CMAKE_GENERATOR}")
endif()
set(TOOLSET "VS_${MSVC_TOOLSET_VERSION}")
elseif((${CMAKE_GENERATOR} MATCHES "Unix Makefiles") OR
- (${CMAKE_GENERATOR} MATCHES "MSYS Makefiles") OR
- (${CMAKE_GENERATOR} MATCHES "MinGW Makefiles") OR
- (${CMAKE_GENERATOR} MATCHES "Ninja"))
+ (${CMAKE_GENERATOR} MATCHES "MSYS Makefiles") OR
+ (${CMAKE_GENERATOR} MATCHES "MinGW Makefiles") OR
+ (${CMAKE_GENERATOR} MATCHES "Ninja"))
set(TOOLSET "mingw")
elseif(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
set(TOOLSET "VS_NMake")
else()
- message(FATAL_ERROR "unknown GENERATOR ${CMAKE_GENERATOR}")
+ message(FATAL_ERROR "unknown GENERATOR ${CMAKE_GENERATOR}")
endif()