diff options
author | Brent Cook <busterb@gmail.com> | 2023-07-04 10:37:24 +0300 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2023-07-04 10:37:24 +0300 |
commit | 71ce0b8c3e07079a40011d2f3515969e3bdf302e (patch) | |
tree | 78aae3da0c893e54f2c65240f4dc3cbc317d739c /apps | |
parent | b16ad4dbd4143aa27e89744a635ebd7d48697af4 (diff) | |
download | portable-71ce0b8c3e07079a40011d2f3515969e3bdf302e.tar.gz portable-71ce0b8c3e07079a40011d2f3515969e3bdf302e.tar.bz2 portable-71ce0b8c3e07079a40011d2f3515969e3bdf302e.zip |
generate opensslconf.h in build dir for cmake
Diffstat (limited to 'apps')
-rw-r--r-- | apps/nc/CMakeLists.txt | 10 | ||||
-rw-r--r-- | apps/ocspcheck/CMakeLists.txt | 12 | ||||
-rw-r--r-- | apps/openssl/CMakeLists.txt | 17 |
3 files changed, 27 insertions, 12 deletions
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt index bd59211..ffd68e5 100644 --- a/apps/nc/CMakeLists.txt +++ b/apps/nc/CMakeLists.txt | |||
@@ -36,8 +36,14 @@ else() | |||
36 | endif() | 36 | endif() |
37 | 37 | ||
38 | add_executable(nc ${NC_SRC}) | 38 | add_executable(nc ${NC_SRC}) |
39 | target_include_directories(nc PUBLIC ../../include) | 39 | target_include_directories(nc |
40 | target_include_directories(nc PRIVATE . ./compat ../../include/compat) | 40 | PRIVATE |
41 | . | ||
42 | ./compat | ||
43 | ../../include/compat | ||
44 | PUBLIC | ||
45 | ../../include | ||
46 | ${CMAKE_BINARY_DIR}/include) | ||
41 | target_link_libraries(nc ${LIBTLS_LIBS}) | 47 | target_link_libraries(nc ${LIBTLS_LIBS}) |
42 | 48 | ||
43 | if(ENABLE_NC) | 49 | if(ENABLE_NC) |
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt index 2dddb6e..43eebdf 100644 --- a/apps/ocspcheck/CMakeLists.txt +++ b/apps/ocspcheck/CMakeLists.txt | |||
@@ -8,9 +8,9 @@ set( | |||
8 | 8 | ||
9 | check_function_exists(memmem HAVE_MEMMEM) | 9 | check_function_exists(memmem HAVE_MEMMEM) |
10 | if(HAVE_MEMMEM) | 10 | if(HAVE_MEMMEM) |
11 | add_definitions(-DHAVE_MEMMEM) | 11 | add_definitions(-DHAVE_MEMMEM) |
12 | else() | 12 | else() |
13 | set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) | 13 | set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) |
14 | endif() | 14 | endif() |
15 | 15 | ||
16 | if(NOT "${OPENSSLDIR}" STREQUAL "") | 16 | if(NOT "${OPENSSLDIR}" STREQUAL "") |
@@ -20,8 +20,12 @@ else() | |||
20 | endif() | 20 | endif() |
21 | 21 | ||
22 | add_executable(ocspcheck ${OCSPCHECK_SRC}) | 22 | add_executable(ocspcheck ${OCSPCHECK_SRC}) |
23 | target_include_directories(ocspcheck PUBLIC ../../include) | 23 | target_include_directories(ocspcheck |
24 | target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat) | 24 | PRIVATE |
25 | ../../include/compat | ||
26 | PUBLIC | ||
27 | ../../include | ||
28 | ${CMAKE_BINARY_DIR}/include) | ||
25 | target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) | 29 | target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) |
26 | 30 | ||
27 | if(ENABLE_LIBRESSL_INSTALL) | 31 | if(ENABLE_LIBRESSL_INSTALL) |
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index 437c0db..efea217 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt | |||
@@ -61,15 +61,20 @@ if(WIN32) | |||
61 | endif() | 61 | endif() |
62 | 62 | ||
63 | if(CMAKE_SYSTEM_NAME MATCHES "Darwin") | 63 | if(CMAKE_SYSTEM_NAME MATCHES "Darwin") |
64 | check_function_exists(clock_gettime HAVE_CLOCK_GETTIME) | 64 | check_function_exists(clock_gettime HAVE_CLOCK_GETTIME) |
65 | if(NOT HAVE_CLOCK_GETTIME) | 65 | if(NOT HAVE_CLOCK_GETTIME) |
66 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/clock_gettime_osx.c) | 66 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/clock_gettime_osx.c) |
67 | endif() | 67 | endif() |
68 | endif() | 68 | endif() |
69 | 69 | ||
70 | add_executable(openssl ${OPENSSL_SRC}) | 70 | add_executable(openssl ${OPENSSL_SRC}) |
71 | target_include_directories(openssl PUBLIC ../../include) | 71 | target_include_directories(openssl |
72 | target_include_directories(openssl PRIVATE . ../../include/compat) | 72 | PRIVATE |
73 | . | ||
74 | ../../include/compat | ||
75 | PUBLIC | ||
76 | ../../include | ||
77 | ${CMAKE_BINARY_DIR}/include) | ||
73 | target_link_libraries(openssl ${OPENSSL_LIBS}) | 78 | target_link_libraries(openssl ${OPENSSL_LIBS}) |
74 | 79 | ||
75 | if(ENABLE_LIBRESSL_INSTALL) | 80 | if(ENABLE_LIBRESSL_INSTALL) |