Skip to content

Commit

Permalink
Build 64-bit OpenSSL in Windows superbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
qris committed Jan 8, 2018
1 parent 94c1363 commit 6d264b7
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
2 changes: 2 additions & 0 deletions appveyor.yml
Expand Up @@ -59,10 +59,12 @@ install:
- echo cmake -G "%generator_name%"
-DBOXBACKUP_VERSION=%compiled_version%
-DSUB_CMAKE_EXTRA_ARGS="-- /verbosity:minimal"
-DPLATFORM=%sane_platform%
%APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\windows
- cmake -G "%generator_name%"
-DBOXBACKUP_VERSION=%compiled_version%
-DSUB_CMAKE_EXTRA_ARGS="-- /verbosity:minimal"
-DPLATFORM=%sane_platform%
%APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\windows

# Leave the current directory in the correct place to find the solution file using its relative path above.
Expand Down
14 changes: 12 additions & 2 deletions infrastructure/cmake/windows/CMakeLists.txt
Expand Up @@ -44,13 +44,23 @@ ExternalProject_Add(zlib
)

if(WIN32)
if(PLATFORM STREQUAL "x64")
set(openssl_config debug-VC-WIN64A)
set(batch_config ms\\do_win64a.bat)
else()
set(openssl_config debug-VC-WIN32)
set(batch_config ms\\do_ms.bat)
endif()
ExternalProject_Add(openssl
DEPENDS zlib
URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz"
URL_HASH ${OPENSSL_HASH}
DOWNLOAD_NO_PROGRESS 1
CONFIGURE_COMMAND perl Configure debug-VC-WIN32 no-asm --prefix=${install_dir}
COMMAND cmd /c ms\\do_ms.bat
CONFIGURE_COMMAND perl Configure ${openssl_config} no-asm
--prefix=${install_dir}
-I${install_dir}/include
-L${install_dir}/lib
COMMAND cmd /c ${batch_config}
# You would expect us to use nt.mak to compile a static library here, but mk1mf.pl uses the /MT[d]
# CRT in that case, which is incompatible with our dynamic runtime, /MD[d]. It seems that the libs
# built by ntdll.mak, which are compiled with /MD[d], are full libraries and not import libs,
Expand Down

0 comments on commit 6d264b7

Please sign in to comment.