factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scope private/public headers when embedding into other projects

Browse Source 
thanks to Cameron Palmer
This commit is contained in:
Brent Cook 2018-05-29 05:44:34 -05:00
parent 9b4044d8ed
commit 4fcfc82d83
7 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/nc/CMakeLists.txt
View File

@ -1,12 +1,5 @@
if(BUILD_NC) if(BUILD_NC)
include_directories(
.
./compat
../../include
../../include/compat
)
set( set(
NC_SRC NC_SRC
atomicio.c atomicio.c
@ -50,6 +43,7 @@ else()
endif() endif()
add_executable(nc ${NC_SRC}) add_executable(nc ${NC_SRC})
target_include_directories(nc PRIVATE . ./compat)
target_link_libraries(nc tls ${OPENSSL_LIBS}) target_link_libraries(nc tls ${OPENSSL_LIBS})
if(ENABLE_NC) if(ENABLE_NC)

8
apps/ocspcheck/CMakeLists.txt
View File

@ -1,12 +1,5 @@
if(NOT MSVC) if(NOT MSVC)
include_directories(
.
./compat
../../include
../../include/compat
)
set( set(
OCSPCHECK_SRC OCSPCHECK_SRC
http.c http.c
@ -27,6 +20,7 @@ else()
endif() endif()
add_executable(ocspcheck ${OCSPCHECK_SRC}) add_executable(ocspcheck ${OCSPCHECK_SRC})
target_include_directories(ocspcheck PRIVATE . ./compat)
target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
if(ENABLE_LIBRESSL_INSTALL) if(ENABLE_LIBRESSL_INSTALL)

7
apps/openssl/CMakeLists.txt
View File

@ -1,9 +1,3 @@
include_directories(
.
../../include
../../include/compat
)
set( set(
OPENSSL_SRC OPENSSL_SRC
apps.c apps.c
@ -74,6 +68,7 @@ else()
endif() endif()
add_executable(openssl ${OPENSSL_SRC}) add_executable(openssl ${OPENSSL_SRC})
target_include_directories(openssl PRIVATE .)
target_link_libraries(openssl ${OPENSSL_LIBS}) target_link_libraries(openssl ${OPENSSL_LIBS})
if(ENABLE_LIBRESSL_INSTALL) if(ENABLE_LIBRESSL_INSTALL)

23
crypto/CMakeLists.txt
View File

@ -1,14 +1,3 @@
include_directories(
.
../include
../include/compat
asn1
bn
dsa
evp
modes
)
if(HOST_ASM_ELF_X86_64) if(HOST_ASM_ELF_X86_64)
set( set(
ASM_X86_64_ELF_SRC ASM_X86_64_ELF_SRC
@ -810,6 +799,18 @@ if(EXTRA_EXPORT)
endif() endif()
add_library(crypto ${CRYPTO_SRC}) add_library(crypto ${CRYPTO_SRC})
target_include_directories(crypto
PRIVATE
.
asn1
bn
dsa
evp
modes
PUBLIC
../include
../include/compat)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym) export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
if (WIN32) if (WIN32)

13
ssl/CMakeLists.txt
View File

@ -1,9 +1,3 @@
include_directories(
.
../include
../include/compat
)
set( set(
SSL_SRC SSL_SRC
bio_ssl.c bio_ssl.c
@ -48,6 +42,13 @@ set(
) )
add_library(ssl ${SSL_SRC}) add_library(ssl ${SSL_SRC})
target_include_directories(ssl
PRIVATE
.
PUBLIC
../include
../include/compat)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
target_link_libraries(ssl crypto) target_link_libraries(ssl crypto)

2
tests/CMakeLists.txt
View File

@ -1,7 +1,5 @@
include_directories( include_directories(
. .
../include
../include/compat
../crypto/modes ../crypto/modes
../crypto/asn1 ../crypto/asn1
../ssl ../ssl

13
tls/CMakeLists.txt
View File

@ -1,9 +1,3 @@
include_directories(
.
../include
../include/compat
)
set( set(
TLS_SRC TLS_SRC
tls.c tls.c
@ -37,6 +31,13 @@ else()
endif() endif()
add_library(tls ${TLS_SRC}) add_library(tls ${TLS_SRC})
target_include_directories(tls
PRIVATE
.
PUBLIC
../include
../include/compat)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
export_symbol(tls ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym) export_symbol(tls ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym)
target_link_libraries(tls ssl crypto) target_link_libraries(tls ssl crypto)