Skip to content

Commit 7c4b05e

Browse files
committed
fix appvoyer nasm
1 parent 08704f4 commit 7c4b05e

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ platform:
1515
install:
1616
- curl -L -o nasminst.exe http://www.nasm.us/pub/nasm/releasebuilds/2.13.01/win64/nasm-2.13.01-installer-x64.exe
1717
- start /wait nasminst.exe /S
18-
- ps: $env:path="C:\Program Files (x86)\nasm;$($env:path)"
18+
- ps: $env:path="C:\Program Files\nasm;$($env:path)"
1919
- ps: wget https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -outfile "VCForPython27.msi"
2020
- start /wait msiexec /i c:\projects\proj\VCForPython27.msi /quiet /qn /norestart
2121
- pip install autobahntestsuite

CMakeLists-ExternalProjects.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ExternalProject_Add(
4646
set(ASIO_INCLUDE_DIRS "${GLOBAL_OUTPUT_PATH}/asio/asio/include")
4747
include_directories(${ASIO_INCLUDE_DIRS})
4848

49-
49+
set(OPENSSLBUILDOPTIONS no-ssl2 no-ssl3 no-shared no-weak-ssl-ciphers)
5050
if(WIN32)
5151

5252
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -61,7 +61,7 @@ if(WIN32)
6161
ExternalProject_Add(
6262
openssl
6363
URL https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.tar.gz
64-
CONFIGURE_COMMAND perl Configure no-shared ${PERLCONFIGURECOMMAND} "--prefix=${GLOBAL_OUTPUT_PATH}/openssl"
64+
CONFIGURE_COMMAND perl Configure ${OPENSSLBUILDOPTIONS} ${PERLCONFIGURECOMMAND} "--prefix=${GLOBAL_OUTPUT_PATH}/openssl"
6565
BUILD_COMMAND "ms\\${PERLBUILDCOMMAND}.bat"
6666
COMMAND nmake -f "ms\\ntdll.mak"
6767
BUILD_IN_SOURCE 1
@@ -71,13 +71,11 @@ if(WIN32)
7171
${CMAKE_STATIC_LIBRARY_PREFIX}libeay32${CMAKE_STATIC_LIBRARY_SUFFIX}
7272
${CMAKE_STATIC_LIBRARY_PREFIX}ssleay32${CMAKE_STATIC_LIBRARY_SUFFIX}
7373
)
74-
elseif(APPLE)
75-
7674
else()
7775
ExternalProject_Add(
7876
openssl
7977
URL https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.tar.gz
80-
CONFIGURE_COMMAND ./config no-shared ${PERLCONFIGURECOMMAND} "--prefix=${GLOBAL_OUTPUT_PATH}/openssl"
78+
CONFIGURE_COMMAND ./config ${OPENSSLBUILDOPTIONS} ${PERLCONFIGURECOMMAND} "--prefix=${GLOBAL_OUTPUT_PATH}/openssl"
8179
BUILD_COMMAND make
8280
BUILD_IN_SOURCE 1
8381
INSTALL_COMMAND make install

0 commit comments

Comments
 (0)