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

Ensure include directories for external libraries are on the path.

This commit is contained in:
Jim Hague 2019-10-29 15:38:54 +00:00
parent 6a043d2fac
commit 4af076f5fb
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@ -530,6 +530,9 @@ target_include_directories(getdns_objects
src/yxml src/yxml
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
# Note - CMake 3.5 doesn't like target_link_libraries on objects,
# which would be preferred way to add an include dependency.
${OPENSSL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR}
) )
if (NOT HAVE_SSL_DANE_ENABLE) if (NOT HAVE_SSL_DANE_ENABLE)
@ -538,10 +541,13 @@ if (NOT HAVE_SSL_DANE_ENABLE)
set(USE_DANESSL 1) set(USE_DANESSL 1)
endif () endif ()
if (Libidn_FOUND) if (Libidn_FOUND)
target_include_directories(getdns_objects PRIVATE Libidn::Libidn) target_include_directories(getdns_objects PRIVATE ${LIBIDN_INCLUDE_DIR})
endif () endif ()
if (Libidn2_FOUND) if (Libidn2_FOUND)
target_include_directories(getdns_objects PRIVATE Libidn2::Libidn2) target_include_directories(getdns_objects PRIVATE ${LIBIDN2_INCLUDE_DIR})
endif ()
if (Libunbound_FOUND)
target_include_directories(getdns_objects PRIVATE ${LIBUNBOUND_INCLUDE_DIR})
endif () endif ()
# Don't compile separate objects for shared and static libraries. # Don't compile separate objects for shared and static libraries.
@ -617,7 +623,11 @@ if (USE_LIBEV)
PRIVATE PRIVATE
src src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${LIBEV_INCLUDE_DIR}
) )
if (Libunbound_FOUND)
target_link_libraries(ev_objects PUBLIC Libunbound::Libunbound)
endif ()
set_property(TARGET ev_objects PROPERTY POSITION_INDEPENDENT_CODE 1) set_property(TARGET ev_objects PROPERTY POSITION_INDEPENDENT_CODE 1)
set_property(TARGET ev_objects PROPERTY C_STANDARD 11) set_property(TARGET ev_objects PROPERTY C_STANDARD 11)
if (ENABLE_STATIC) if (ENABLE_STATIC)
@ -661,7 +671,11 @@ if (USE_LIBEVENT2)
PRIVATE PRIVATE
src src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${LIBEVENT2_INCLUDE_DIR}
) )
if (Libunbound_FOUND)
target_link_libraries(event2_objects PUBLIC Libunbound::Libunbound)
endif ()
set_property(TARGET event2_objects PROPERTY POSITION_INDEPENDENT_CODE 1) set_property(TARGET event2_objects PROPERTY POSITION_INDEPENDENT_CODE 1)
set_property(TARGET event2_objects PROPERTY C_STANDARD 11) set_property(TARGET event2_objects PROPERTY C_STANDARD 11)
if (ENABLE_STATIC) if (ENABLE_STATIC)
@ -700,7 +714,11 @@ if (USE_LIBUV)
PRIVATE PRIVATE
src src
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${LIBUV_INCLUDE_DIR}
) )
if (Libunbound_FOUND)
target_link_libraries(uv_objects PUBLIC Libunbound::Libunbound)
endif ()
set_property(TARGET uv_objects PROPERTY POSITION_INDEPENDENT_CODE 1) set_property(TARGET uv_objects PROPERTY POSITION_INDEPENDENT_CODE 1)
set_property(TARGET uv_objects PROPERTY C_STANDARD 11) set_property(TARGET uv_objects PROPERTY C_STANDARD 11)
if (ENABLE_STATIC) if (ENABLE_STATIC)
@ -754,8 +772,10 @@ endif ()
if (BUILD_TESTING) if (BUILD_TESTING)
find_package(Check "0.9.6") find_package(Check "0.9.6")
if (NOT Check_FOUND) if (WIN32)
message(WARNING "check library not found, not building test programs") message(WARNING "test programs do not build on Windows, skipping.")
elseif (NOT Check_FOUND)
message(WARNING "check library not found, not building test programs.")
else () else ()
add_executable(check_getdns add_executable(check_getdns
src/test/check_getdns_common.c src/test/check_getdns_common.c