interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Properly sort out exporting the include directory for in-tree builds but not for out of tree builds.

This commit is contained in:
Jim Hague 2019-10-22 15:42:06 +01:00
parent 165078a50d
commit 2414d31951
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -464,7 +464,9 @@ set_property(TARGET getdns_objects PROPERTY C_STANDARD 11)
# Static library version of main library. # Static library version of main library.
add_library(getdns STATIC $<TARGET_OBJECTS:getdns_objects>) add_library(getdns STATIC $<TARGET_OBJECTS:getdns_objects>)
target_include_directories(getdns PUBLIC src) target_include_directories(getdns PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
)
target_link_libraries(getdns target_link_libraries(getdns
PUBLIC PUBLIC
OpenSSL::SSL OpenSSL::SSL
@ -476,7 +478,9 @@ set_target_properties(getdns PROPERTIES OUTPUT_NAME getdns${static_lib_suffix})
# Shared library version of main library. # Shared library version of main library.
add_library(getdns_shared SHARED $<TARGET_OBJECTS:getdns_objects>) add_library(getdns_shared SHARED $<TARGET_OBJECTS:getdns_objects>)
target_include_directories(getdns PUBLIC src) target_include_directories(getdns_shared PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
)
target_link_libraries(getdns_shared target_link_libraries(getdns_shared
PUBLIC PUBLIC
OpenSSL::SSL OpenSSL::SSL
@ -529,14 +533,12 @@ add_executable(getdns_query src/tools/getdns_query.c)
if (NOT HAVE_GETTIMEOFDAY) if (NOT HAVE_GETTIMEOFDAY)
target_sources(getdns_query PRIVATE src/compat/gettimeofday.c) target_sources(getdns_query PRIVATE src/compat/gettimeofday.c)
endif () endif ()
target_include_directories(getdns_query PRIVATE getdns)
target_link_libraries(getdns_query PRIVATE getdns) target_link_libraries(getdns_query PRIVATE getdns)
set_property(TARGET getdns_query PROPERTY C_STANDARD 11) set_property(TARGET getdns_query PROPERTY C_STANDARD 11)
add_executable(getdns_server_mon src/tools/getdns_server_mon.c) add_executable(getdns_server_mon src/tools/getdns_server_mon.c)
target_include_directories(getdns_server_mon target_include_directories(getdns_server_mon
PRIVATE PRIVATE
getdns
OpenSSL:SSL OpenSSL:SSL
OpenSSL:Crypto OpenSSL:Crypto
) )