changeset 10:89bc83dc91e2

libopenssl: switch to markdown format
author David Demelier <markand@malikania.fr>
date Fri, 11 Aug 2017 15:42:41 +0200
parents efa166f40b1f
children 1aa4bcc50188
files CMakeLists.txt libopenssl.md libopenssl/CMakeLists.txt
diffstat 3 files changed, 42 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Mon Jan 02 16:35:15 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#
-# CMakeLists.txt -- devkit for Windows
-#
-# Copyright (c) 2016-2017 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-cmake_minimum_required(VERSION 3.6)
-project(devkit)
-add_subdirectory(libopenssl)
-add_subdirectory(libz)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libopenssl.md	Fri Aug 11 15:42:41 2017 +0200
@@ -0,0 +1,42 @@
+Build libopenssl
+================
+
+Version:    1.1.0b
+Date:       20170811
+
+Download
+--------
+
+  - https://www.openssl.org/source/openssl-1.1.0b.tar.gz
+
+Dependencies
+------------
+
+  - [Perl](http://strawberryperl.com).
+
+Configure
+---------
+
+Be sure to have `perl.exe` into your path.
+
+### Visual Studio
+
+amd64
+
+    perl Configure VC-WIN64A no-asm shared
+        --prefix=C:\env\vs\amd64
+        --openssldir=C:\env\vs\amd64
+
+x86
+
+    perl Configure VC-WIN32 no-asm shared
+        --prefix=C:\env\vs\amd64
+        --openssldir=C:\env\vs\amd64
+
+Build
+-----
+
+### Visual Studio
+
+    nmake
+    nmake install
--- a/libopenssl/CMakeLists.txt	Mon Jan 02 16:35:15 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# CMakeLists.txt -- build for libopenssl
-#
-# Copyright (c) 2016-2017 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-cmake_minimum_required(VERSION 3.5)
-project(libopenssl)
-include(ExternalProject)
-
-find_package(Perl REQUIRED)
-
-if (MSVC)
-    if (CMAKE_SIZEOF_VOID_P MATCHES 8)
-        set(TGT "VC-WIN64A")
-    else ()
-        set(TGT "VC-WIN32")
-    endif ()
-
-    ExternalProject_Add(
-        libopenssl
-        SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libopenssl
-        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libopenssl
-        URL https://www.openssl.org/source/openssl-1.1.0b.tar.gz
-        URL_HASH SHA1=cbf391d0d68a9f144c24c5c3c5028c07fa00264c
-        CONFIGURE_COMMAND
-            ${PERL_EXECUTABLE} Configure $<$<CONFIG:Debug>:debug->${TGT} no-asm shared --prefix=${CMAKE_INSTALL_PREFIX} --openssldir=${CMAKE_INSTALL_PREFIX}
-        BUILD_COMMAND
-            nmake
-        INSTALL_COMMAND
-            nmake install
-    )
-endif ()