Be a little more modern CMake.

This commit is contained in:
Jim Hague 2019-10-18 11:28:39 +01:00
parent 4df33630ea
commit 4304bb7017
1 changed files with 22 additions and 16 deletions

View File

@ -456,23 +456,26 @@ if (NOT STRPTIME_WORKS)
endif () endif ()
set(getdns_INCLUDES set(getdns_INCLUDES
PUBLIC src PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SRC_DIR}/src>
PRIVATE src/util/auxiliary PRIVATE
PRIVATE src/openssl src/util/auxiliary
PRIVATE src/tls src/openssl
PRIVATE src/yxml src/tls
PRIVATE stubby/src # Wrong, wrong, wrong. src/yxml
stubby/src # Wrong, wrong, wrong.
PRIVATE ${OPENSSL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR}
PRIVATE ${LIBBSD_INCLUDE_DIRS} ${LIBBSD_INCLUDE_DIRS}
PRIVATE Threads::Threads Threads::Threads
) )
set(getdns_LIBS set(getdns_LIBS
PUBLIC ${OPENSSL_LIBRARIES} PUBLIC
PUBLIC Threads::Threads ${OPENSSL_LIBRARIES}
PUBLIC ${getdns_system_libs} Threads::Threads
${getdns_system_libs}
) )
if (NOT HAVE_SSL_DANE_ENABLE) if (NOT HAVE_SSL_DANE_ENABLE)
@ -497,12 +500,15 @@ target_link_libraries(getdns_query PRIVATE getdns)
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 getdns PRIVATE
PRIVATE ${OPENSSL_INCLUDE_DIR} getdns
${OPENSSL_INCLUDE_DIR}
) )
target_link_libraries(getdns_server_mon target_link_libraries(getdns_server_mon
PRIVATE getdns PUBLIC
PUBLIC ${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
PRIVATE
getdns
) )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/include/cmakeconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/include/cmakeconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)