diff options
| author | Don <don.j.olmstead@gmail.com> | 2018-03-16 14:59:53 -0700 |
|---|---|---|
| committer | Don <don.j.olmstead@gmail.com> | 2018-03-16 14:59:53 -0700 |
| commit | 09590953d05672f62a1f95913e6149f490dced80 (patch) | |
| tree | 976726f1462fc9ce924c96d98f636976be109f9a | |
| parent | 639a6629ae4b2243d1d15670f90750c3200ff4bf (diff) | |
| download | portable-09590953d05672f62a1f95913e6149f490dced80.tar.gz portable-09590953d05672f62a1f95913e6149f490dced80.tar.bz2 portable-09590953d05672f62a1f95913e6149f490dced80.zip | |
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.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | apps/openssl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | crypto/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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() | |||
| 279 | set(OPENSSL_LIBS tls ssl crypto) | 279 | set(OPENSSL_LIBS tls ssl crypto) |
| 280 | endif() | 280 | endif() |
| 281 | 281 | ||
| 282 | if(CMAKE_HOST_WIN32) | 282 | if(WIN32) |
| 283 | set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) | 283 | set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) |
| 284 | endif() | 284 | endif() |
| 285 | if(CMAKE_SYSTEM_NAME MATCHES "Linux") | 285 | 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( | |||
| 55 | x509.c | 55 | x509.c |
| 56 | ) | 56 | ) |
| 57 | 57 | ||
| 58 | if(CMAKE_HOST_UNIX) | 58 | if(UNIX) |
| 59 | set(OPENSSL_SRC ${OPENSSL_SRC} apps_posix.c) | 59 | set(OPENSSL_SRC ${OPENSSL_SRC} apps_posix.c) |
| 60 | set(OPENSSL_SRC ${OPENSSL_SRC} certhash.c) | 60 | set(OPENSSL_SRC ${OPENSSL_SRC} certhash.c) |
| 61 | endif() | 61 | endif() |
| 62 | 62 | ||
| 63 | if(CMAKE_HOST_WIN32) | 63 | if(WIN32) |
| 64 | set(OPENSSL_SRC ${OPENSSL_SRC} apps_win.c) | 64 | set(OPENSSL_SRC ${OPENSSL_SRC} apps_win.c) |
| 65 | set(OPENSSL_SRC ${OPENSSL_SRC} certhash_win.c) | 65 | set(OPENSSL_SRC ${OPENSSL_SRC} certhash_win.c) |
| 66 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c) | 66 | 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( | |||
| 643 | x509v3/v3err.c | 643 | x509v3/v3err.c |
| 644 | ) | 644 | ) |
| 645 | 645 | ||
| 646 | if(CMAKE_HOST_UNIX) | 646 | if(UNIX) |
| 647 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c) | 647 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c) |
| 648 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/bss_log.c) | 648 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/bss_log.c) |
| 649 | set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c) | 649 | set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c) |
| 650 | endif() | 650 | endif() |
| 651 | 651 | ||
| 652 | if(CMAKE_HOST_WIN32) | 652 | if(WIN32) |
| 653 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c) | 653 | set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c) |
| 654 | set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) | 654 | set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log) |
| 655 | set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c) | 655 | set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c) |
| 656 | endif() | 656 | endif() |
| 657 | 657 | ||
| 658 | if(CMAKE_HOST_WIN32) | 658 | if(WIN32) |
| 659 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/posix_win.c) | 659 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/posix_win.c) |
| 660 | set(EXTRA_EXPORT ${EXTRA_EXPORT} gettimeofday) | 660 | set(EXTRA_EXPORT ${EXTRA_EXPORT} gettimeofday) |
| 661 | set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_perror) | 661 | set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_perror) |
| @@ -732,7 +732,7 @@ if(NOT HAVE_TIMEGM) | |||
| 732 | endif() | 732 | endif() |
| 733 | 733 | ||
| 734 | if(NOT HAVE_EXPLICIT_BZERO) | 734 | if(NOT HAVE_EXPLICIT_BZERO) |
| 735 | if(CMAKE_HOST_WIN32) | 735 | if(WIN32) |
| 736 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero_win.c) | 736 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero_win.c) |
| 737 | else() | 737 | else() |
| 738 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) | 738 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) |
| @@ -749,7 +749,7 @@ if(NOT HAVE_ARC4RANDOM_BUF) | |||
| 749 | set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) | 749 | set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) |
| 750 | 750 | ||
| 751 | if(NOT HAVE_GETENTROPY) | 751 | if(NOT HAVE_GETENTROPY) |
| 752 | if(CMAKE_HOST_WIN32) | 752 | if(WIN32) |
| 753 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_win.c) | 753 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_win.c) |
| 754 | elseif(CMAKE_SYSTEM_NAME MATCHES "AIX") | 754 | elseif(CMAKE_SYSTEM_NAME MATCHES "AIX") |
| 755 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_aix.c) | 755 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_aix.c) |
| @@ -783,7 +783,7 @@ endif() | |||
| 783 | if(NOT ENABLE_ASM) | 783 | if(NOT ENABLE_ASM) |
| 784 | add_definitions(-DOPENSSL_NO_ASM) | 784 | add_definitions(-DOPENSSL_NO_ASM) |
| 785 | else() | 785 | else() |
| 786 | if(CMAKE_HOST_WIN32) | 786 | if(WIN32) |
| 787 | add_definitions(-DOPENSSL_NO_ASM) | 787 | add_definitions(-DOPENSSL_NO_ASM) |
| 788 | endif() | 788 | endif() |
| 789 | endif() | 789 | 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) | |||
| 163 | 163 | ||
| 164 | # explicit_bzero | 164 | # explicit_bzero |
| 165 | # explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows | 165 | # explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows |
| 166 | if(NOT CMAKE_HOST_WIN32) | 166 | if(NOT WIN32) |
| 167 | if(HAVE_MEMMEM) | 167 | if(HAVE_MEMMEM) |
| 168 | add_executable(explicit_bzero explicit_bzero.c) | 168 | add_executable(explicit_bzero explicit_bzero.c) |
| 169 | else() | 169 | 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( | |||
| 19 | tls_verify.c | 19 | tls_verify.c |
| 20 | ) | 20 | ) |
| 21 | 21 | ||
| 22 | if(CMAKE_HOST_WIN32) | 22 | if(WIN32) |
| 23 | set( | 23 | set( |
| 24 | TLS_SRC | 24 | TLS_SRC |
| 25 | ${TLS_SRC} | 25 | ${TLS_SRC} |
| 26 | compat/ftruncate.c | 26 | compat/ftruncate.c |
| 27 | compat/getuid.c | 27 | compat/getuid.c |
| 28 | compat/pread.c | 28 | compat/pread.c |
| 29 | compat/pwrite.c | 29 | compat/pwrite.c |
| 30 | ) | 30 | ) |
| 31 | endif() | 31 | endif() |
| 32 | 32 | ||
| 33 | if(NOT "${OPENSSLDIR}" STREQUAL "") | 33 | if(NOT "${OPENSSLDIR}" STREQUAL "") |
