factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Land #578, add support for use of static MSVC runtimes

Browse Source
This commit is contained in:
Brent Cook 2020-05-01 11:02:09 -05:00
commit 1b2044f355
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -1,4 +1,9 @@
if(MSVC)
cmake_minimum_required (VERSION 3.16.4)
cmake_policy(SET CMP0091 NEW)
else()
cmake_minimum_required (VERSION 3.0) cmake_minimum_required (VERSION 3.0)
endif()
include(CheckFunctionExists) include(CheckFunctionExists)
include(CheckSymbolExists) include(CheckSymbolExists)
include(CheckLibraryExists) include(CheckLibraryExists)
@ -36,6 +41,11 @@ option(ENABLE_EXTRATESTS "Enable extra tests that may be unreliable on some plat
option(ENABLE_NC "Enable installing TLS-enabled nc(1)" OFF) option(ENABLE_NC "Enable installing TLS-enabled nc(1)" OFF)
set(OPENSSLDIR ${OPENSSLDIR} CACHE PATH "Set the default openssl directory" FORCE) set(OPENSSLDIR ${OPENSSLDIR} CACHE PATH "Set the default openssl directory" FORCE)
option(USE_STATIC_MSVC_RUNTIMES "Use /MT instead of /MD in MSVC" OFF)
if(USE_STATIC_MSVC_RUNTIMES)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif()
if(NOT LIBRESSL_SKIP_INSTALL) if(NOT LIBRESSL_SKIP_INSTALL)
set( ENABLE_LIBRESSL_INSTALL ON ) set( ENABLE_LIBRESSL_INSTALL ON )
endif(NOT LIBRESSL_SKIP_INSTALL) endif(NOT LIBRESSL_SKIP_INSTALL)

29
appveyor.yml
View File

@ -1,25 +1,28 @@
image: image:
- Visual Studio 2015 - Visual Studio 2019
#- Visual Studio 2017
environment: environment:
PATH: C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH% PATH: C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH%
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
GENERATOR: Visual Studio 14 2015 Win64 GENERATOR: Visual Studio 16 2019
ARCHITECTURE: Win32
CONFIG: Release CONFIG: Release
SHARED_LIBS: ON SHARED_LIBS: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
GENERATOR: Visual Studio 14 2015 GENERATOR: Visual Studio 16 2019
CONFIG: Release ARCHITECTURE: Win32
SHARED_LIBS: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
GENERATOR: Visual Studio 14 2015 Win64
CONFIG: Release CONFIG: Release
SHARED_LIBS: OFF SHARED_LIBS: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
GENERATOR: Visual Studio 14 2015 GENERATOR: Visual Studio 16 2019
ARCHITECTURE: x64
CONFIG: Release
SHARED_LIBS: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
GENERATOR: Visual Studio 16 2019
ARCHITECTURE: x64
CONFIG: Release CONFIG: Release
SHARED_LIBS: OFF SHARED_LIBS: OFF
@ -34,7 +37,7 @@ before_build:
- bash autogen.sh - bash autogen.sh
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%SHARED_LIBS% -DCMAKE_INSTALL_PREFIX=../local - cmake .. -G "%GENERATOR%" -A "%ARCHITECTURE%" -DBUILD_SHARED_LIBS=%SHARED_LIBS% -DCMAKE_INSTALL_PREFIX=../local
build_script: build_script:
- cmake --build . --config %CONFIG% - cmake --build . --config %CONFIG%