From 09590953d05672f62a1f95913e6149f490dced80 Mon Sep 17 00:00:00 2001 From: Don Date: Fri, 16 Mar 2018 14:59:53 -0700 Subject: Remove CMAKE_HOST_ references CMAKE_HOST_ describes the host system not the target. For cross compilation to work the actual target system should be used for making decisions in CMake. --- CMakeLists.txt | 2 +- apps/openssl/CMakeLists.txt | 4 ++-- crypto/CMakeLists.txt | 12 ++++++------ tests/CMakeLists.txt | 2 +- tls/CMakeLists.txt | 18 +++++++++--------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df92e6a..df20441 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,7 +279,7 @@ else() set(OPENSSL_LIBS tls ssl crypto) endif() -if(CMAKE_HOST_WIN32) +if(WIN32) set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) endif() if(CMAKE_SYSTEM_NAME MATCHES "Linux") diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index 718c208..8b800c4 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt @@ -55,12 +55,12 @@ set( x509.c ) -if(CMAKE_HOST_UNIX) +if(UNIX) set(OPENSSL_SRC ${OPENSSL_SRC} apps_posix.c) set(OPENSSL_SRC ${OPENSSL_SRC} certhash.c) endif() -if(CMAKE_HOST_WIN32) +if(WIN32) set(OPENSSL_SRC ${OPENSSL_SRC} apps_win.c) set(OPENSSL_SRC ${OPENSSL_SRC} certhash_win.c) set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 0615110..b67623d 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -643,19 +643,19 @@ set( x509v3/v3err.c ) -if(CMAKE_HOST_UNIX) +if(UNIX) set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c) set(CRYPTO_SRC ${CRYPTO_SRC} bio/bss_log.c) set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c) endif() -if(CMAKE_HOST_WIN32) +if(WIN32) set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c) set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c) endif() -if(CMAKE_HOST_WIN32) +if(WIN32) set(CRYPTO_SRC ${CRYPTO_SRC} compat/posix_win.c) set(EXTRA_EXPORT ${EXTRA_EXPORT} gettimeofday) set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_perror) @@ -732,7 +732,7 @@ if(NOT HAVE_TIMEGM) endif() if(NOT HAVE_EXPLICIT_BZERO) - if(CMAKE_HOST_WIN32) + if(WIN32) set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero_win.c) else() set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) @@ -749,7 +749,7 @@ if(NOT HAVE_ARC4RANDOM_BUF) set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) if(NOT HAVE_GETENTROPY) - if(CMAKE_HOST_WIN32) + if(WIN32) set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_win.c) elseif(CMAKE_SYSTEM_NAME MATCHES "AIX") set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_aix.c) @@ -783,7 +783,7 @@ endif() if(NOT ENABLE_ASM) add_definitions(-DOPENSSL_NO_ASM) else() - if(CMAKE_HOST_WIN32) + if(WIN32) add_definitions(-DOPENSSL_NO_ASM) endif() endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b6d94bf..bbf6a32 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -163,7 +163,7 @@ add_test(evptest evptest ${CMAKE_CURRENT_SOURCE_DIR}/evptests.txt) # explicit_bzero # explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows -if(NOT CMAKE_HOST_WIN32) +if(NOT WIN32) if(HAVE_MEMMEM) add_executable(explicit_bzero explicit_bzero.c) else() diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index 0e13da5..7530c10 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt @@ -19,15 +19,15 @@ set( tls_verify.c ) -if(CMAKE_HOST_WIN32) -set( - TLS_SRC - ${TLS_SRC} - compat/ftruncate.c - compat/getuid.c - compat/pread.c - compat/pwrite.c -) +if(WIN32) + set( + TLS_SRC + ${TLS_SRC} + compat/ftruncate.c + compat/getuid.c + compat/pread.c + compat/pwrite.c + ) endif() if(NOT "${OPENSSLDIR}" STREQUAL "") -- cgit v1.2.3-55-g6feb