diff options
| author | Brent Cook <bcook@openbsd.org> | 2018-05-29 05:44:34 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2018-05-29 05:46:54 -0500 |
| commit | 4fcfc82d83de32098530abfa3aff5d6fc5532433 (patch) | |
| tree | 449adaa04fdd66b065fb9ffd4f58912d398c03ca /apps | |
| parent | 9b4044d8edce19f72649ba2960a54d57373b84b5 (diff) | |
| download | portable-4fcfc82d83de32098530abfa3aff5d6fc5532433.tar.gz portable-4fcfc82d83de32098530abfa3aff5d6fc5532433.tar.bz2 portable-4fcfc82d83de32098530abfa3aff5d6fc5532433.zip | |
scope private/public headers when embedding into other projects
thanks to Cameron Palmer
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/nc/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | apps/ocspcheck/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | apps/openssl/CMakeLists.txt | 7 |
3 files changed, 3 insertions, 20 deletions
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt index 64d14fa..30c1745 100644 --- a/apps/nc/CMakeLists.txt +++ b/apps/nc/CMakeLists.txt | |||
| @@ -1,12 +1,5 @@ | |||
| 1 | if(BUILD_NC) | 1 | if(BUILD_NC) |
| 2 | 2 | ||
| 3 | include_directories( | ||
| 4 | . | ||
| 5 | ./compat | ||
| 6 | ../../include | ||
| 7 | ../../include/compat | ||
| 8 | ) | ||
| 9 | |||
| 10 | set( | 3 | set( |
| 11 | NC_SRC | 4 | NC_SRC |
| 12 | atomicio.c | 5 | atomicio.c |
| @@ -50,6 +43,7 @@ else() | |||
| 50 | endif() | 43 | endif() |
| 51 | 44 | ||
| 52 | add_executable(nc ${NC_SRC}) | 45 | add_executable(nc ${NC_SRC}) |
| 46 | target_include_directories(nc PRIVATE . ./compat) | ||
| 53 | target_link_libraries(nc tls ${OPENSSL_LIBS}) | 47 | target_link_libraries(nc tls ${OPENSSL_LIBS}) |
| 54 | 48 | ||
| 55 | if(ENABLE_NC) | 49 | if(ENABLE_NC) |
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt index 15af8a8..9e0d012 100644 --- a/apps/ocspcheck/CMakeLists.txt +++ b/apps/ocspcheck/CMakeLists.txt | |||
| @@ -1,12 +1,5 @@ | |||
| 1 | if(NOT MSVC) | 1 | if(NOT MSVC) |
| 2 | 2 | ||
| 3 | include_directories( | ||
| 4 | . | ||
| 5 | ./compat | ||
| 6 | ../../include | ||
| 7 | ../../include/compat | ||
| 8 | ) | ||
| 9 | |||
| 10 | set( | 3 | set( |
| 11 | OCSPCHECK_SRC | 4 | OCSPCHECK_SRC |
| 12 | http.c | 5 | http.c |
| @@ -27,6 +20,7 @@ else() | |||
| 27 | endif() | 20 | endif() |
| 28 | 21 | ||
| 29 | add_executable(ocspcheck ${OCSPCHECK_SRC}) | 22 | add_executable(ocspcheck ${OCSPCHECK_SRC}) |
| 23 | target_include_directories(ocspcheck PRIVATE . ./compat) | ||
| 30 | target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) | 24 | target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) |
| 31 | 25 | ||
| 32 | if(ENABLE_LIBRESSL_INSTALL) | 26 | if(ENABLE_LIBRESSL_INSTALL) |
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index 8b800c4..1fe9004 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | include_directories( | ||
| 2 | . | ||
| 3 | ../../include | ||
| 4 | ../../include/compat | ||
| 5 | ) | ||
| 6 | |||
| 7 | set( | 1 | set( |
| 8 | OPENSSL_SRC | 2 | OPENSSL_SRC |
| 9 | apps.c | 3 | apps.c |
| @@ -74,6 +68,7 @@ else() | |||
| 74 | endif() | 68 | endif() |
| 75 | 69 | ||
| 76 | add_executable(openssl ${OPENSSL_SRC}) | 70 | add_executable(openssl ${OPENSSL_SRC}) |
| 71 | target_include_directories(openssl PRIVATE .) | ||
| 77 | target_link_libraries(openssl ${OPENSSL_LIBS}) | 72 | target_link_libraries(openssl ${OPENSSL_LIBS}) |
| 78 | 73 | ||
| 79 | if(ENABLE_LIBRESSL_INSTALL) | 74 | if(ENABLE_LIBRESSL_INSTALL) |
