scmno****@osdn*****
scmno****@osdn*****
2018年 7月 29日 (日) 23:17:09 JST
Tera TermRevision: 7170
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7170
Author: zmatsuo
Date: 2018-07-29 23:17:09 +0900 (Sun, 29 Jul 2018)
Log Message:
-----------
libsフォルダでライブラリを生成、各プロジェクトから参照するようにした
Modified Paths:
--------------
branches/cmake/TTProxy/CMakeLists.txt
branches/cmake/libs/SFMT.cmake
branches/cmake/libs/VSToolchain.cmake
branches/cmake/libs/buildall.cmake
branches/cmake/libs/buildall_cmake.bat
branches/cmake/libs/oniguruma.cmake
branches/cmake/libs/openssl.cmake
branches/cmake/libs/putty.cmake
branches/cmake/libs/zlib.cmake
branches/cmake/teraterm/teraterm/CMakeLists.txt
branches/cmake/teraterm/ttpdlg/CMakeLists.txt
branches/cmake/teraterm/ttpmacro/CMakeLists.txt
branches/cmake/teraterm/ttptek/CMakeLists.txt
branches/cmake/ttssh2/ttxssh/CMakeLists.txt
Added Paths:
-----------
branches/cmake/libs/lib_SFMT.cmake
branches/cmake/libs/lib_oniguruma.cmake
branches/cmake/libs/lib_openssl.cmake
branches/cmake/libs/lib_zlib.cmake
-------------- next part --------------
Modified: branches/cmake/TTProxy/CMakeLists.txt
===================================================================
--- branches/cmake/TTProxy/CMakeLists.txt 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/TTProxy/CMakeLists.txt 2018-07-29 14:17:09 UTC (rev 7170)
@@ -2,6 +2,8 @@
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+include(${CMAKE_CURRENT_SOURCE_DIR}/../libs/lib_openssl.cmake)
+
set(SRC
../teraterm/common/ttlib.c
../teraterm/common/ttlib.h
@@ -26,7 +28,7 @@
../teraterm/teraterm
../teraterm/common
YCL/include
- ../libs/openssl/inc32
+ ${OPENSSL_INCLUDE_DIRS}
.
)
Modified: branches/cmake/libs/SFMT.cmake
===================================================================
--- branches/cmake/libs/SFMT.cmake 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/libs/SFMT.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,122 +1,112 @@
-
-#set(GENERATOR "Visual Studio 15 2017")
-string(REPLACE " " "_" GENERATOR_ ${GENERATOR})
-
-set(SRC_DIR_BASE "SFMT-src-1.5.1")
-set(SRC_ARC "SFMT-1.5.1.zip")
-set(SRC_URL "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/SFMT-src-1.5.1.zip")
-set(SRC_ARC_HASH_SHA256 630d1dfa6b690c30472f75fa97ca90ba62f9c13c5add6c264fdac2c1d3a878f4)
-
-set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/SFMT")
-set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/src")
-set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/src/${SRC_DIR_BASE}")
-set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/build_${GENERATOR_}")
-set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/SFMT_${GENERATOR_}")
-
-if(NOT EXISTS ${SRC_DIR}/README.txt)
-
- file(DOWNLOAD
- ${SRC_URL}
- ${DOWN_DIR}/${SRC_ARC}
- EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
- SHOW_PROGRESS
- )
-
- file(MAKE_DIRECTORY ${EXTRACT_DIR})
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
- WORKING_DIRECTORY ${EXTRACT_DIR}
- )
-
-endif()
-
-########################################
-
-file(WRITE "${SRC_DIR}/CMakeLists.txt"
- "cmake_minimum_required(VERSION 2.4.4)\n"
- "project(SFMT C)\n"
- "\n"
- "add_library(\n"
- " sfmt STATIC\n"
- " SFMT.c\n"
- " )\n"
- "\n"
- "install(\n"
- " TARGETS sfmt\n"
- " ARCHIVE DESTINATION \${CMAKE_INSTALL_PREFIX}/lib\n"
- " )\n"
- "install(\n"
- " FILES SFMT.h SFMT-params.h\n"
- " DESTINATION \${CMAKE_INSTALL_PREFIX}/include\n"
- " )\n"
- )
-
-########################################
-
-file(MAKE_DIRECTORY "${BUILD_DIR}")
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${GENERATOR}
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
- -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake generate fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config release
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake build fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config release --target install
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake install fail ${rv}")
-endif()
-
-########################################
-
-set(BUILD_DIR "${BUILD_DIR}_debug")
-set(INSTALL_DIR "${INSTALL_DIR}_debug")
-
-file(MAKE_DIRECTORY "${BUILD_DIR}")
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${GENERATOR}
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
- -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake generate fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config debug
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake build fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config debug --target install
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake install fail ${rv}")
-endif()
+# cmake -DGENERATOR="Visual Studio 15 2017" -P SFMT.cmake
+
+string(REPLACE " " "_" GENERATOR_ ${GENERATOR})
+
+set(SRC_DIR_BASE "SFMT-src-1.5.1")
+set(SRC_ARC "SFMT-1.5.1.zip")
+set(SRC_URL "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/SFMT-src-1.5.1.zip")
+set(SRC_ARC_HASH_SHA256 630d1dfa6b690c30472f75fa97ca90ba62f9c13c5add6c264fdac2c1d3a878f4)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/SFMT")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/src")
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/src/${SRC_DIR_BASE}")
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/build_${GENERATOR_}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/SFMT_${GENERATOR_}")
+
+if(NOT EXISTS ${SRC_DIR}/README.txt)
+
+ file(DOWNLOAD
+ ${SRC_URL}
+ ${DOWN_DIR}/${SRC_ARC}
+ EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+ SHOW_PROGRESS
+ )
+
+ file(MAKE_DIRECTORY ${EXTRACT_DIR})
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+ WORKING_DIRECTORY ${EXTRACT_DIR}
+ )
+
+endif()
+
+########################################
+
+file(WRITE "${SRC_DIR}/CMakeLists.txt"
+ "cmake_minimum_required(VERSION 2.4.4)\n"
+ "project(SFMT C)\n"
+ "\n"
+ "if(MSVC)\n"
+ " set(CMAKE_DEBUG_POSTFIX \"d\")\n"
+ "endif()\n"
+ "\n"
+ "add_library(\n"
+ " sfmt STATIC\n"
+ " SFMT.c\n"
+ " )\n"
+ "\n"
+ "install(\n"
+ " TARGETS sfmt\n"
+ " ARCHIVE DESTINATION \${CMAKE_INSTALL_PREFIX}/lib\n"
+ " )\n"
+ "install(\n"
+ " FILES SFMT.h SFMT-params.h SFMT-params19937.h\n"
+ " DESTINATION \${CMAKE_INSTALL_PREFIX}/include\n"
+ " )\n"
+ )
+
+########################################
+
+file(MAKE_DIRECTORY "${BUILD_DIR}")
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${GENERATOR}
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+ -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake generate fail ${rv}")
+endif()
+
+########################################
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config release
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+endif()
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config release --target install
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake install fail ${rv}")
+endif()
+
+########################################
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config debug
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+endif()
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config debug --target install
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake install fail ${rv}")
+endif()
Modified: branches/cmake/libs/VSToolchain.cmake
===================================================================
--- branches/cmake/libs/VSToolchain.cmake 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/libs/VSToolchain.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,3 +1,5 @@
-# write to CMakeCache.txt
-set(CMAKE_C_FLAGS_DEBUG "/DWIN32 /D_WINDOWS /W3 /MDd /Zi /Ob0 /Od /RTC1" CACHE STRING "" FORCE)
-set(CMAKE_C_FLAGS_RELEASE "/DWIN32 /D_WINDOWS /W3 /MD /O2 /Ob2 /DNDEBUG" CACHE STRING "" FORCE)
+# write to CMakeCache.txt
+set(CMAKE_C_FLAGS_DEBUG "/DWIN32 /D_WINDOWS /W3 /MTd /Zi /Ob0 /Od /RTC1" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG "/DWIN32 /D_WINDOWS /W3 /MTd /Zi /Ob0 /Od /RTC1" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "/DWIN32 /D_WINDOWS /W3 /MT /O2 /Ob2 /DNDEBUG" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "/DWIN32 /D_WINDOWS /W3 /MT /O2 /Ob2 /DNDEBUG" CACHE STRING "" FORCE)
Modified: branches/cmake/libs/buildall.cmake
===================================================================
--- branches/cmake/libs/buildall.cmake 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/libs/buildall.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,7 +1,10 @@
-
-set(GENERATOR "Visual Studio 15 2017")
-#set(GENERATOR "Visual Studio 14 2015")
+# cmake -DGENERATOR="Vsual Studio 15 2017" -P buildall.cmake
+if("${GENERATOR}" STREQUAL "")
+ #set(GENERATOR "Visual Studio 15 2017")
+ message(FATAL_ERROR "set GENERATOR!")
+endif()
+
# utf-8
execute_process(
COMMAND cmd.exe /c chcp 65001
Modified: branches/cmake/libs/buildall_cmake.bat
===================================================================
--- branches/cmake/libs/buildall_cmake.bat 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/libs/buildall_cmake.bat 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,4 +1,30 @@
-setlocal
-cmake -P buildall.cmake
-endlocal
-pause
+ ＠ echo off
+setlocal
+
+:retry
+echo 1. Visual Studio 15 2017
+echo 2. Visual Studio 14 2015
+echo 3. Visual Studio 12 2013
+echo 4. Visual Studio 11 2012
+echo 5. Visual Studio 10 2010
+echo 6. Visual Studio 9 2008
+echo 7. Visual Studio 8 2005
+set /p no="select no "
+
+echo %no%
+if "%no%" == "1" set GENERATOR="Visual Studio 15 2017" & goto build_all
+if "%no%" == "2" set GENERATOR="Visual Studio 14 2015" & goto build_all
+if "%no%" == "3" set GENERATOR="Visual Studio 12 2013" & goto build_all
+if "%no%" == "4" set GENERATOR="Visual Studio 11 2012" & goto build_all
+if "%no%" == "5" set GENERATOR="Visual Studio 10 2010" & goto build_all
+if "%no%" == "6" set GENERATOR="Visual Studio 9 2008" & goto build_all
+if "%no%" == "7" set GENERATOR="Visual Studio 8 2005" & goto build_all
+echo ? retry
+goto retry
+
+:build_all
+echo cmake -DGENERATOR=%GENERATOR% -P buildall.cmake
+pause
+cmake -DGENERATOR=%GENERATOR% -P buildall.cmake
+endlocal
+pause
Added: branches/cmake/libs/lib_SFMT.cmake
===================================================================
--- branches/cmake/libs/lib_SFMT.cmake (rev 0)
+++ branches/cmake/libs/lib_SFMT.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -0,0 +1,10 @@
+
+string(REPLACE " " "_" GENERATOR_ ${CMAKE_GENERATOR})
+
+set(SFMT_INCLUDE_DIRS
+ "${CMAKE_CURRENT_LIST_DIR}/SFMT_${GENERATOR_}/include"
+ )
+
+set(SFMT_LIBRARY_DIRS
+ "${CMAKE_CURRENT_LIST_DIR}/SFMT_${GENERATOR_}/lib"
+ )
Added: branches/cmake/libs/lib_oniguruma.cmake
===================================================================
--- branches/cmake/libs/lib_oniguruma.cmake (rev 0)
+++ branches/cmake/libs/lib_oniguruma.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -0,0 +1,11 @@
+
+string(REPLACE " " "_" GENERATOR_ ${CMAKE_GENERATOR})
+
+list(
+ APPEND
+ CMAKE_PREFIX_PATH
+ "${CMAKE_CURRENT_LIST_DIR}/oniguruma_${GENERATOR_}/"
+ )
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(ONIGURUMA REQUIRED oniguruma)
+
Added: branches/cmake/libs/lib_openssl.cmake
===================================================================
--- branches/cmake/libs/lib_openssl.cmake (rev 0)
+++ branches/cmake/libs/lib_openssl.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -0,0 +1,14 @@
+
+string(REPLACE " " "_" GENERATOR_ ${CMAKE_GENERATOR})
+
+set(OPENSSL_INCLUDE_DIRS
+ "$<$<CONFIG:Debug>:${CMAKE_CURRENT_LIST_DIR}/openssl_${GENERATOR_}_debug/include>"
+ "$<$<CONFIG:Release>:${CMAKE_CURRENT_LIST_DIR}/openssl_${GENERATOR_}/include>"
+ )
+
+set(OPENSSL_LIB
+ debug ${CMAKE_CURRENT_LIST_DIR}/openssl_${GENERATOR_}_debug/lib/libeay32.lib
+ debug ${CMAKE_CURRENT_LIST_DIR}/openssl_${GENERATOR_}_debug/lib/ssleay32.lib
+ optimized ${CMAKE_CURRENT_LIST_DIR}/openssl_${GENERATOR_}/lib/libeay32.lib
+ optimized ${CMAKE_CURRENT_LIST_DIR}/openssl_${GENERATOR_}/lib/ssleay32.lib
+ )
Added: branches/cmake/libs/lib_zlib.cmake
===================================================================
--- branches/cmake/libs/lib_zlib.cmake (rev 0)
+++ branches/cmake/libs/lib_zlib.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -0,0 +1,11 @@
+
+string(REPLACE " " "_" GENERATOR_ ${CMAKE_GENERATOR})
+
+list(
+ APPEND
+ CMAKE_PREFIX_PATH
+ "${CMAKE_CURRENT_LIST_DIR}/zlib_${GENERATOR_}"
+ )
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(ZLIB REQUIRED zlib)
+
Modified: branches/cmake/libs/oniguruma.cmake
===================================================================
--- branches/cmake/libs/oniguruma.cmake 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/libs/oniguruma.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,101 +1,90 @@
-
-#set(GENERATOR "Visual Studio 15 2017")
-string(REPLACE " " "_" GENERATOR_ ${GENERATOR})
-
-set(SRC_DIR_BASE "onig-6.8.2")
-set(SRC_ARC "onig-6.8.2.tar.gz")
-set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.8.2/onig-6.8.2.tar.gz")
-set(SRC_ARC_HASH_SHA1 4bd58a64fcff233118dcdf6d1ad9607c67bdb878)
-
-set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/oniguruma")
-set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src")
-set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src/${SRC_DIR_BASE}")
-set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/build_${GENERATOR_}")
-set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/oniguruma_${GENERATOR_}")
-
-if(NOT EXISTS ${SRC_DIR}/README.md)
-
- file(DOWNLOAD
- ${SRC_URL}
- ${DOWN_DIR}/${SRC_ARC}
- EXPECTED_HASH SHA1=${SRC_ARC_HASH_SHA1}
- SHOW_PROGRESS
- )
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
- )
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
- WORKING_DIRECTORY ${EXTRACT_DIR}
- )
-
-endif()
-
-########################################
-
-file(MAKE_DIRECTORY "${BUILD_DIR}")
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${GENERATOR}
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
- -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
- -DBUILD_SHARED_LIBS=OFF
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake generate fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config release
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake build fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config release --target install
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake install fail ${rv}")
-endif()
-
-########################################
-
-file(MAKE_DIRECTORY "${BUILD_DIR}_debug")
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${GENERATOR}
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
- -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}_debug
- -DBUILD_SHARED_LIBS=OFF
- WORKING_DIRECTORY ${BUILD_DIR}_debug
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake generate fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config debug
- WORKING_DIRECTORY ${BUILD_DIR}_debug
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake build fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config debug --target install
- WORKING_DIRECTORY ${BUILD_DIR}_debug
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake install fail ${rv}")
-endif()
+# cmake -DGENERATOR="Visual Studio 15 2017" -P oniguruma.cmake
+
+string(REPLACE " " "_" GENERATOR_ ${GENERATOR})
+
+set(SRC_DIR_BASE "onig-6.8.2")
+set(SRC_ARC "onig-6.8.2.tar.gz")
+set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.8.2/onig-6.8.2.tar.gz")
+set(SRC_ARC_HASH_SHA1 4bd58a64fcff233118dcdf6d1ad9607c67bdb878)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/oniguruma")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src")
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src/${SRC_DIR_BASE}")
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/build_${GENERATOR_}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/oniguruma_${GENERATOR_}")
+
+if(NOT EXISTS ${SRC_DIR}/README.md)
+
+ file(DOWNLOAD
+ ${SRC_URL}
+ ${DOWN_DIR}/${SRC_ARC}
+ EXPECTED_HASH SHA1=${SRC_ARC_HASH_SHA1}
+ SHOW_PROGRESS
+ )
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
+ )
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+ WORKING_DIRECTORY ${EXTRACT_DIR}
+ )
+
+endif()
+
+########################################
+
+file(MAKE_DIRECTORY "${BUILD_DIR}")
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${GENERATOR}
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+ -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+ -DCMAKE_DEBUG_POSTFIX=d
+ -DBUILD_SHARED_LIBS=OFF
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake generate fail ${rv}")
+endif()
+
+########################################
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config release
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+endif()
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config release --target install
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake install fail ${rv}")
+endif()
+
+########################################
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config debug
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+endif()
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config debug --target install
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake install fail ${rv}")
+endif()
Modified: branches/cmake/libs/openssl.cmake
===================================================================
--- branches/cmake/libs/openssl.cmake 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/libs/openssl.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,128 +1,128 @@
-
-#set(GENERATOR "Visual Studio 15 2017")
-string(REPLACE " " "_" GENERATOR_ ${GENERATOR})
-
-set(SRC_DIR_BASE "openssl-1.0.2o")
-set(SRC_ARC "openssl-1.0.2o.tar.xz")
-set(SRC_URL "https://www.openssl.org/source/openssl-1.0.2o.tar.gz")
-set(SRC_ARC_HASH_SHA256 ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d)
-
-set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/openssl")
-
-set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/openssl/src_${GENERATOR_}")
-set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
-set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/openssl_${GENERATOR_}")
-
-########################################
-
-file(DOWNLOAD
- ${SRC_URL}
- ${DOWN_DIR}/${SRC_ARC}
- EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
- SHOW_PROGRESS
- )
-
-########################################
-
-find_program(
- PERL perl.exe
- HINTS c:/cygwin/usr/bin
- HINTS c:/cygwin64/usr/bin
- )
-if(PERL-NOTFOUND)
- message(FATAL_ERROR "perl not found")
-endif()
-if(GENERATOR MATCHES "Visual Studio 15 2017")
- find_program(
- VCVARS32 vcvars32.bat
- HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
- HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
- HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
- )
-else()
- set(VCVARS32-NOTFOUND 1)
-endif()
-if(VCVARS32-NOTFOUND)
- message(FATAL_ERROR "vcvars32.bat not found")
-endif()
-
-########################################
-
-if(NOT EXISTS ${SRC_DIR}/README)
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
- )
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
- WORKING_DIRECTORY ${EXTRACT_DIR}
- )
-
-endif()
-
-########################################
-
-file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
-file(WRITE "${SRC_DIR}/build_cmake.bat"
- "call \"${VCVARS32}\"\n"
- "cd %~dp0\n"
- "${PERL} Configure no-asm VC-WIN32 --prefix=${INSTALL_DIR_N}\n"
- "call ms\\do_ms.bat\n"
- "nmake -f ms\\nt.mak install\n"
- )
-
-set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
-file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
-execute_process(
- COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
- WORKING_DIRECTORY ${SRC_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake build fail ${rv}")
-endif()
-
-########################################
-
-set(EXTRACT_DIR "${EXTRACT_DIR}_debug")
-set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
-set(INSTALL_DIR "${INSTALL_DIR}_debug")
-
-########################################
-
-if(NOT EXISTS ${SRC_DIR}/README)
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
- )
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
- WORKING_DIRECTORY ${EXTRACT_DIR}
- )
-
-endif()
-
-########################################
-
-file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
-file(WRITE "${SRC_DIR}/build_cmake.bat"
- "call \"${VCVARS32}\"\n"
- "cd %~dp0\n"
- "${PERL} Configure no-asm debug-VC-WIN32 --prefix=${INSTALL_DIR_N}\n"
- "call ms\\do_ms.bat\n"
- "nmake -f ms\\nt.mak install\n"
- )
-
-set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
-file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
-execute_process(
- COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
- WORKING_DIRECTORY ${SRC_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake build fail ${rv}")
-endif()
-
+# cmake -DGENERATOR="Visual Studio 15 2017" -P openssl.cmake
+
+string(REPLACE " " "_" GENERATOR_ ${GENERATOR})
+
+set(SRC_DIR_BASE "openssl-1.0.2o")
+set(SRC_ARC "openssl-1.0.2o.tar.xz")
+set(SRC_URL "https://www.openssl.org/source/openssl-1.0.2o.tar.gz")
+set(SRC_ARC_HASH_SHA256 ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/openssl")
+
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/openssl/src_${GENERATOR_}")
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/openssl_${GENERATOR_}")
+
+########################################
+
+file(DOWNLOAD
+ ${SRC_URL}
+ ${DOWN_DIR}/${SRC_ARC}
+ EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+ SHOW_PROGRESS
+ )
+
+########################################
+
+find_program(
+ PERL perl.exe
+ HINTS c:/cygwin/usr/bin
+ HINTS c:/cygwin64/usr/bin
+ )
+if(PERL-NOTFOUND)
+ message(FATAL_ERROR "perl not found")
+endif()
+if(GENERATOR MATCHES "Visual Studio 15 2017")
+ find_program(
+ VCVARS32 vcvars32.bat
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
+ )
+else()
+ set(VCVARS32-NOTFOUND 1)
+endif()
+if(VCVARS32-NOTFOUND)
+ message(FATAL_ERROR "vcvars32.bat not found")
+endif()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README)
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
+ )
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+ WORKING_DIRECTORY ${EXTRACT_DIR}
+ )
+
+endif()
+
+########################################
+
+file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
+file(WRITE "${SRC_DIR}/build_cmake.bat"
+ "call \"${VCVARS32}\"\n"
+ "cd %~dp0\n"
+ "${PERL} Configure no-asm VC-WIN32 --prefix=${INSTALL_DIR_N}\n"
+ "call ms\\do_ms.bat\n"
+ "nmake -f ms\\nt.mak install\n"
+ )
+
+set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
+file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
+execute_process(
+ COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
+ WORKING_DIRECTORY ${SRC_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+endif()
+
+########################################
+
+set(EXTRACT_DIR "${EXTRACT_DIR}_debug")
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+set(INSTALL_DIR "${INSTALL_DIR}_debug")
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README)
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
+ )
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+ WORKING_DIRECTORY ${EXTRACT_DIR}
+ )
+
+endif()
+
+########################################
+
+file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
+file(WRITE "${SRC_DIR}/build_cmake.bat"
+ "call \"${VCVARS32}\"\n"
+ "cd %~dp0\n"
+ "${PERL} Configure no-asm debug-VC-WIN32 --prefix=${INSTALL_DIR_N}\n"
+ "call ms\\do_ms.bat\n"
+ "nmake -f ms\\nt.mak install\n"
+ )
+
+set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
+file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
+execute_process(
+ COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
+ WORKING_DIRECTORY ${SRC_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+endif()
+
Modified: branches/cmake/libs/putty.cmake
===================================================================
--- branches/cmake/libs/putty.cmake 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/libs/putty.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,4 +1,5 @@
-
+# cmake -P putty.cmake
+
set(SRC_DIR_BASE "putty-0.70")
set(SRC_ARC "putty-0.70.tar.gz")
set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.70/putty-0.70.tar.gz")
Modified: branches/cmake/libs/zlib.cmake
===================================================================
--- branches/cmake/libs/zlib.cmake 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/libs/zlib.cmake 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,100 +1,89 @@
-
-#set(GENERATOR "Visual Studio 15 2017")
-string(REPLACE " " "_" GENERATOR_ ${GENERATOR})
-
-set(SRC_DIR_BASE "zlib-1.2.11")
-set(SRC_ARC "zlib-1.2.11.tar.xz")
-set(SRC_URL "https://zlib.net/zlib-1.2.11.tar.xz")
-set(SRC_ARC_HASH_SHA256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066)
-
-set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/zlib")
-set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/zlib/src")
-set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/zlib/src/${SRC_DIR_BASE}")
-set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/zlib/build_${GENERATOR_}")
-set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/zlib_${GENERATOR_}")
-
-if(NOT EXISTS ${SRC_DIR}/README)
-
- file(DOWNLOAD
- ${SRC_URL}
- ${DOWN_DIR}/${SRC_ARC}
- EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
- SHOW_PROGRESS
- )
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
- )
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
- WORKING_DIRECTORY ${EXTRACT_DIR}
- )
-
-endif()
-
-########################################
-
-file(MAKE_DIRECTORY "${BUILD_DIR}")
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${GENERATOR}
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
- -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake generate fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config release
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake build fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config release --target install
- WORKING_DIRECTORY ${BUILD_DIR}
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake install fail ${rv}")
-endif()
-
-########################################
-
-file(MAKE_DIRECTORY "${BUILD_DIR}_debug")
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${GENERATOR}
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
- -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}_debug
- WORKING_DIRECTORY ${BUILD_DIR}_debug
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake generate fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config debug
- WORKING_DIRECTORY ${BUILD_DIR}_debug
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake build fail ${rv}")
-endif()
-
-execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config debug --target install
- WORKING_DIRECTORY ${BUILD_DIR}_debug
- RESULT_VARIABLE rv
- )
-if(NOT rv STREQUAL "0")
- message(FATAL_ERROR "cmake install fail ${rv}")
-endif()
+# cmake -DGENERATOR="Visual Studio 15 2017" -P zlib.cmake
+
+string(REPLACE " " "_" GENERATOR_ ${GENERATOR})
+
+set(SRC_DIR_BASE "zlib-1.2.11")
+set(SRC_ARC "zlib-1.2.11.tar.xz")
+set(SRC_URL "https://zlib.net/zlib-1.2.11.tar.xz")
+set(SRC_ARC_HASH_SHA256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/zlib")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/zlib/src")
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/zlib/src/${SRC_DIR_BASE}")
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/zlib/build_${GENERATOR_}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/zlib_${GENERATOR_}")
+
+if(NOT EXISTS ${SRC_DIR}/README)
+
+ file(DOWNLOAD
+ ${SRC_URL}
+ ${DOWN_DIR}/${SRC_ARC}
+ EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+ SHOW_PROGRESS
+ )
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
+ )
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+ WORKING_DIRECTORY ${EXTRACT_DIR}
+ )
+
+endif()
+
+########################################
+
+file(MAKE_DIRECTORY "${BUILD_DIR}")
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} ${SRC_DIR} -G ${GENERATOR}
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+ -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake generate fail ${rv}")
+endif()
+
+########################################
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config release
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+endif()
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config release --target install
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake install fail ${rv}")
+endif()
+
+########################################
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config debug
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake build fail ${rv}")
+endif()
+
+execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config debug --target install
+ WORKING_DIRECTORY ${BUILD_DIR}
+ RESULT_VARIABLE rv
+ )
+if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "cmake install fail ${rv}")
+endif()
Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,5 +1,8 @@
project(teraterm)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
+
if (MSVC)
string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
@@ -93,12 +96,13 @@
include_directories(
../common
../ttpfile
+ ${SFMT_INCLUDE_DIRS}
.
)
link_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
+ ${ONIGURUMA_LIBRARY_DIRS}
+ ${SFMT_LIBRARY_DIRS}
)
set(CMAKE_MFC_FLAG 1)
@@ -123,8 +127,8 @@
debug nafxcwd.lib
optimized LIBCMT.lib
debug LIBCMTD.lib
- optimized onig_s.lib
- debug onig_sd.lib
+ optimized onig.lib
+ debug onigd.lib
ws2_32.lib
imm32.lib
imagehlp.lib
Modified: branches/cmake/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpdlg/CMakeLists.txt 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/teraterm/ttpdlg/CMakeLists.txt 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,5 +1,7 @@
project(ttpdlg)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
+
if (MSVC)
string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
@@ -31,13 +33,13 @@
)
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
${CMAKE_CURRENT_SOURCE_DIR}/../common
${CMAKE_CURRENT_BINARY_DIR}
+ ${ONIGURUMA_INCLUDE_DIRS}
)
link_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
+ ${ONIGURUMA_LIBRARY_DIRS}
)
add_library(
@@ -48,8 +50,8 @@
target_link_libraries(
ttpdlg
ttpcmn
- optimized onig_s.lib
- debug onig_sd.lib
+ optimized onig.lib
+ debug onigd.lib
)
add_dependencies(
@@ -58,8 +60,9 @@
)
## svnversion.h
-INCLUDE(FindSubversion)
-
+if(EXISTS ${CMAKE_SOURCE_DIR}/.svn)
+ INCLUDE(FindSubversion)
+endif()
if(Subversion_FOUND)
Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#define SVNVERSION ${TT_WC_REVISION}\n")
Modified: branches/cmake/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpmacro/CMakeLists.txt 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/teraterm/ttpmacro/CMakeLists.txt 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,5 +1,8 @@
project(ttpmacro)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
+
if (MSVC)
string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
@@ -60,14 +63,14 @@
)
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
+ ${ONIGURUMA_INCLUDE_DIRS}
+ ${SFMT_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/../common
)
link_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
+ ${ONIGURUMA_LIBRARY_DIRS}
+ ${SFMT_LIBRARY_DIRS}
)
set(CMAKE_MFC_FLAG 1)
@@ -88,10 +91,10 @@
debug nafxcwd.lib
optimized LIBCMT.lib
debug LIBCMTD.lib
- optimized onig_s.lib
- debug onig_sd.lib
- optimized SFMT.lib
- debug SFMTd.lib
+ optimized onig.lib
+ debug onigd.lib
+ optimized sfmt.lib
+ debug sfmtd.lib
iphlpapi.lib
)
Modified: branches/cmake/teraterm/ttptek/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttptek/CMakeLists.txt 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/teraterm/ttptek/CMakeLists.txt 2018-07-29 14:17:09 UTC (rev 7170)
@@ -1,5 +1,8 @@
project(ttptek)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
+
if (MSVC)
string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
@@ -29,14 +32,13 @@
)
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
${CMAKE_CURRENT_SOURCE_DIR}/../common
+ ${ONIGURUMA_INCLUDE}
+ ${SFMT_INCLUDE_DIR}
)
link_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
+ ${SFMT_LIBRARY_DIRS}
)
add_library(
@@ -47,10 +49,10 @@
target_link_libraries(
ttptek
ttpcmn
- optimized onig_s.lib
- debug onig_sd.lib
- optimized SFMT.lib
- debug SFMTd.lib
+# optimized onig.lib
+# debug onigd.lib
+ debug sfmtd.lib
+ optimized sfmt.lib
iphlpapi.lib
)
Modified: branches/cmake/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/cmake/ttssh2/ttxssh/CMakeLists.txt 2018-07-28 15:29:27 UTC (rev 7169)
+++ branches/cmake/ttssh2/ttxssh/CMakeLists.txt 2018-07-29 14:17:09 UTC (rev 7170)
@@ -2,6 +2,9 @@
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+
set(SRC
${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
../../teraterm/teraterm/WSAAsyncGetAddrInfo.c
@@ -72,15 +75,14 @@
include_directories(
../../teraterm/teraterm
../../teraterm/common
- ../../libs/openssl/inc32
- ../../libs/zlib
../matcher
../putty
+ ${OPENSSL_INCLUDE_DIRS}
+ ${ZLIB_INCLUDE_DIRS}
)
link_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/openssl/out32
- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/zlib
+ ${ZLIB_LIBRARY_DIRS}
)
add_library(
@@ -92,8 +94,9 @@
ttxssh
libputty
ttpcmn
- libeay32.lib
- zlib.lib
+ debug zlibstaticd.lib
+ optimized zlibstatic.lib
+ ${OPENSSL_LIB}
ws2_32.lib
dnsapi.lib
)