Tera TermRevision: 7295
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7295
Author: zmatsuo
Date: 2018-12-01 01:49:46 +0900 (Sat, 01 Dec 2018)
Log Message:
-----------
Oniguruma 6.9.0 にアップデート
OpenSSL 1.0.2q にアップデート
Modified Paths:
--------------
branches/cmake/libs/build_library_with_cmake.md
branches/cmake/libs/oniguruma.cmake
branches/cmake/libs/openssl.cmake
-------------- next part --------------
Modified: branches/cmake/libs/build_library_with_cmake.md
===================================================================
--- branches/cmake/libs/build_library_with_cmake.md 2018-11-30 16:49:32 UTC (rev 7294)
+++ branches/cmake/libs/build_library_with_cmake.md 2018-11-30 16:49:46 UTC (rev 7295)
@@ -9,10 +9,20 @@
## Visual Studioの場合
+### batファイルを使用する場合
+
- buildall_cmake.bat を実行
- cmakeを選択
-- コンパイルする Visual Studioを選ぶ
+- コンパイルに使用する Visual Studioを選ぶ
+### cmakeを使用する場合
+
+- cmakeを使える状態にしてcmakeを実行
+ - `cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildall.cmake`
+ - `cmake -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -P buildall.cmake`
+- Visual Studio 2005の場合は、cmakeのバージョン3.11.4以前を使用する
+ - `cmake -DCMAKE_GENERATOR="Visual Studio 8 2005" -P buildall.cmake`
+
## MinGW 共通
- Cygwin,MSYS2,linux(wsl)上のMinGWでビルドできる
Modified: branches/cmake/libs/oniguruma.cmake
===================================================================
--- branches/cmake/libs/oniguruma.cmake 2018-11-30 16:49:32 UTC (rev 7294)
+++ branches/cmake/libs/oniguruma.cmake 2018-11-30 16:49:46 UTC (rev 7295)
@@ -53,10 +53,10 @@
include(script_support.cmake)
-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(SRC_DIR_BASE "onig-6.9.0")
+set(SRC_ARC "onig-6.9.0.tar.gz")
+set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.9.0/onig-6.9.0.tar.gz")
+set(SRC_ARC_HASH_SHA1 8e3e39e8e92f040939922ddc367a56c12bd4c4c3)
set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/oniguruma")
set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src")
Modified: branches/cmake/libs/openssl.cmake
===================================================================
--- branches/cmake/libs/openssl.cmake 2018-11-30 16:49:32 UTC (rev 7294)
+++ branches/cmake/libs/openssl.cmake 2018-11-30 16:49:46 UTC (rev 7295)
@@ -54,10 +54,10 @@
include(script_support.cmake)
-set(SRC_DIR_BASE "openssl-1.0.2p")
-set(SRC_ARC "openssl-1.0.2p.tar.gz")
-set(SRC_URL "https://www.openssl.org/source/openssl-1.0.2p.tar.gz")
-set(SRC_ARC_HASH_SHA256 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00)
+set(SRC_DIR_BASE "openssl-1.0.2q")
+set(SRC_ARC "openssl-1.0.2q.tar.gz")
+set(SRC_URL "https://www.openssl.org/source/openssl-1.0.2q.tar.gz")
+set(SRC_ARC_HASH_SHA256 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684)
set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/openssl")