On the user-defined-authn branch: sync with trunk r1927496.

git-svn-id: https://svn.apache.org/repos/asf/serf/branches/user-defined-authn@1927608 13f79535-47bb-0310-9956-ffa450edef68

Author: brainy

CMakeLists.txt

@@ -49,6 +49,11 @@ message(WARNING
         "Some features are not supported and the build "
         "has not been tested on many supported platforms.")
 
+# Optional dependency options
+option(USE_BROTLI "Use the Brotli decoding library if available" ON)
+option(USE_GSSAPI "Use GSSAPI authentication if available" ON)
+option(USE_UNBOUND "Use the Unbound async resolver if available" ON)
+
 # Build options
 option(DEBUG "Enable debugging info and strict compile warnings" OFF)
 option(DOT_CLANGD "Generate a .clangd file at the root of the source tree" OFF)
@@ -84,6 +89,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 include(GNUInstallDirs)
+include(SerfFindPkgConfig)
 include(SerfPlatform)
 
 # On the Mac: Use dependencies from Homebrew or MacPorts
@@ -242,21 +248,57 @@ if(EXPAT)
 endif(EXPAT)
 
 # Find required dependencies
-find_package(OpenSSL REQUIRED)
-find_package(ZLIB REQUIRED)
 find_package(APR REQUIRED)
 find_package(APRUtil REQUIRED)
 
+
+SerfFindPkgConfig(OpenSSL_SSL OPENSSL_ROOT_DIR libssl OpenSSL::SSL)
+SerfFindPkgConfig(OpenSSL_Crypto OPENSSL_ROOT_DIR libcrypto OpenSSL::Crypto)
+if(NOT (OpenSSL_SSL_FOUND AND OpenSSL_Crypto_FOUND))
+  find_package(OpenSSL REQUIRED)
+  if(OpenSSL_FOUND)
+    set(OPENSSL_PC_LIBS ${OPENSSL_LIBRARIES})
+  endif()
+else()
+  set(OpenSSL_FOUND TRUE)
+  set(OPENSSL_INCLUDE_DIR ${OPENSSL_SSL_INCLUDE_DIR})
+  set(OPENSSL_PC_REQUIRES ${OPENSSL_SSL_PC_REQUIRES} ${OPENSSL_CRYPTO_PC_REQUIRES})
+  set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+endif()
+
+SerfFindPkgConfig(ZLIB ZLIB_ROOT zlib ZLIB::ZLIB)
+if(NOT ZLIB_FOUND)
+  find_package(ZLIB REQUIRED)
+  set(ZLIB_PC_LIBS ${ZLIB_LIBRARIES})
+endif()
+
 # We do not want or need OpenSSL's compatibility macros.
 list(APPEND SERF_C_DEFINES "OPENSSL_NO_DEPRECATED")
 
 # Hide OpenSSL's _fp() API.
 list(APPEND SERF_C_DEFINES "OPENSSL_NO_STDIO")
 
 # Find optional dependencies
-find_package(Brotli)
+if(USE_BROTLI)
+  SerfFindPkgConfig(Brotli Brotli_ROOT libbrotlidec Brotli::Decode)
+  if(NOT Brotli_FOUND)
+    find_package(Brotli)
+    if(Brotli_FOUND)
+      set(BROTLI_PC_LIBS ${BROTLI_DECODE_LIBRARY})
+    endif()
+  endif()
+endif()
+
 if(NOT SERF_WINDOWS)
-  find_package(GSSAPI)
+  if(USE_GSSAPI)
+    SerfFindPkgConfig(GSSAPI GSSAPI_ROOT krb5-gssapi KRB5::GSSAPI)
+    if(NOT GSSAPI_FOUND)
+      find_package(GSSAPI)
+      if(GSSAPI_FOUND)
+        set(GSSAPI_PC_LIBS ${GSSAPI_LIBRARIES})
+      endif()
+    endif()
+  endif()
 else()
   # We use SSPI on Windows and there's no Kerberos/GSSAPI port there.
   set(GSSAPI_FOUND FALSE)
@@ -265,36 +307,17 @@ else()
   endif()
 endif()
 
-
-# FIXME: VERYTEMPORARY, figure out FindUnbound.cmake first.
-set(Unbound_FOUND FALSE)
-if (Unbound_FOUND)
-  set(UNBOUND_INCLUDE_DIR "/opt/homebrew/opt/unbound/include")
-  set(UNBOUND_LIBRARIES "/opt/homebrew/opt/unbound/lib/libunbound.dylib")
-  # set(UNBOUND_LIBRARIES "/usr/lib/aarch64-linux-gnu/libunbound.so")
-  # set(UNBOUND_LIBRARIES "/usr/lib64/libunbound.so")
-  add_library(Unbound::Unbound UNKNOWN IMPORTED)
-  set_target_properties(Unbound::Unbound PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${UNBOUND_INCLUDE_DIR}")
-  set_target_properties(Unbound::Unbound PROPERTIES
-    IMPORTED_LOCATION "${UNBOUND_LIBRARIES}")
-endif(Unbound_FOUND)
-
-# Calculate the set of private and public targets
-set(SERF_PRIVATE_TARGETS OpenSSL::Crypto OpenSSL::SSL ZLIB::ZLIB)
-if(Brotli_FOUND)
-  list(APPEND SERF_PRIVATE_TARGETS Brotli::Decode)
-endif()
-if(GSSAPI_FOUND)
-  list(APPEND SERF_C_DEFINES "SERF_HAVE_GSSAPI")
-  list(APPEND SERF_PRIVATE_TARGETS KRB5::GSSAPI)
-endif()
-if(Unbound_FOUND)
-  list(APPEND SERF_C_DEFINES "SERF_HAVE_ASYNC_RESOLVER=1")
-  list(APPEND SERF_C_DEFINES "SERF_HAVE_UNBOUND")
-  list(APPEND SERF_PRIVATE_TARGETS Unbound::Unbound)
+if(USE_UNBOUND)
+  SerfFindPkgConfig(Unbound Unbound_ROOT libunbound Unbound::Unbound)
+  if(NOT Unbound_FOUND)
+    find_package(Unbound)
+    if(Unbound_FOUND)
+      set(UNBOUND_PC_LIBS "${UNBOUND_LIBRARY}")
+    endif()
+  endif()
 endif()
 
+# Calculate the set of private and public targets
 if(APR_STATIC)
   if(SERF_WINDOWS)
     list(APPEND SERF_PUBLIC_TARGETS APR::APR_static)
@@ -311,6 +334,20 @@ else(APR_STATIC)
   endif()
 endif(APR_STATIC)
 
+list(APPEND SERF_PRIVATE_TARGETS OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
+if(Brotli_FOUND)
+  list(APPEND SERF_PRIVATE_TARGETS Brotli::Decode)
+endif()
+if(GSSAPI_FOUND)
+  list(APPEND SERF_C_DEFINES "SERF_HAVE_GSSAPI")
+  list(APPEND SERF_PRIVATE_TARGETS KRB5::GSSAPI)
+endif()
+if(Unbound_FOUND)
+  list(APPEND SERF_C_DEFINES "SERF_HAVE_ASYNC_RESOLVER=1")
+  list(APPEND SERF_C_DEFINES "SERF_HAVE_UNBOUND=1")
+  list(APPEND SERF_PRIVATE_TARGETS Unbound::Unbound)
+endif()
+
 # Feature tests
 include(SerfChecks)
 CheckNotFunction("BIO_set_init" "NULL, 0" "SERF_NO_SSL_BIO_WRAPPERS"
@@ -458,11 +495,9 @@ if(NOT SKIP_SHARED)
   list(APPEND SERF_TARGETS serf_shared)
 
   if(SERF_WINDOWS)
-    string(TOLOWER "${CMAKE_BUILD_TYPE}" config)
-    if(NOT "${config}" STREQUAL "release")
-      install(FILES $<TARGET_PDB_FILE:serf_shared>
-              DESTINATION "${SERF_INSTALL_RUNTIME}")
-    endif()
+    install(FILES $<TARGET_PDB_FILE:serf_shared>
+            CONFIGURATIONS Debug RelWithDebinfo
+            DESTINATION "${SERF_INSTALL_RUNTIME}")
   endif()
 endif()
 
@@ -498,41 +533,59 @@ install(TARGETS ${SERF_TARGETS}
 install(FILES ${HEADERS} DESTINATION "${SERF_INSTALL_HEADERS}")
 
 # Generate the pkg-config module file.
-if(NOT SERF_WINDOWS)
-  set(SERF_PC_FILE "serf-${SERF_MAJOR_VERSION}.pc")
+set(SERF_PC_FILE "serf-${SERF_MAJOR_VERSION}.pc")
 
-  # Use a separate variable scope for the substitutions in serf.pc.in.
-  function(make_pkgconfig)
-    # Use a relative prefix to create a relocatable PC file.
+# Use a separate variable scope for the substitutions in serf.pc.in.
+function(make_pkgconfig)
+  # Use a relative prefix to create a relocatable PC file.
+  if(SERF_WINDOWS)
+    file(RELATIVE_PATH relfragment "X:\\${SERF_INSTALL_PKGCONFIG}" "X:\\")
+  else()
     file(RELATIVE_PATH relfragment "/${SERF_INSTALL_PKGCONFIG}" "/")
-    file(TO_CMAKE_PATH "\${pcfiledir}/${relfragment}" relprefix)
-
-    set(PREFIX ${relprefix})
-    set(INCLUDE_SUBDIR ${SERF_INCLUDE_SUBDIR})
-    set(LIBDIR \${prefix}/${SERF_INSTALL_LIBRARIES})
-    set(VERSION ${SERF_VERSION})
-    set(MAJOR ${SERF_MAJOR_VERSION})
-    set(LIBS
-      ${APR_LDFLAGS}
-      ${APR_LIBRARIES}
-      ${APR_EXTRALIBS}
-      ${APRUTIL_LDFLAGS}
-      ${APRUTIL_LIBRARIES}
-      ${APRUTIL_EXTRALIBS}
-      ${BROTLI_COMMON_LIBRARY}
-      ${BROTLI_DECODE_LIBRARY}
-      ${GSSAPI_LIBRARIES}
-      ${ZLIB_LIBRARIES}
-      )
-    list(REMOVE_DUPLICATES LIBS)
-    list(JOIN LIBS " " LIBS)
-    configure_file("build/serf.pc.in" "${SERF_PC_FILE}" @ONLY)
-  endfunction()
-
-  make_pkgconfig()
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${SERF_PC_FILE}"
-          DESTINATION "${SERF_INSTALL_PKGCONFIG}")
-endif()
+  endif()
+  file(TO_CMAKE_PATH "\${pcfiledir}/${relfragment}" relprefix)
+
+  set(PREFIX ${relprefix})
+  set(INCLUDE_SUBDIR ${SERF_INCLUDE_SUBDIR})
+  set(LIBDIR \${prefix}/${SERF_INSTALL_LIBRARIES})
+  set(VERSION ${SERF_VERSION})
+  set(MAJOR ${SERF_MAJOR_VERSION})
+  set(REQUIRES
+    ${OPENSSL_PC_REQUIRES}
+    ${ZLIB_PC_REQUIRES}
+    ${BROTLI_PC_REQUIRES}
+    ${GSSAPI_PC_REQUIRES}
+    ${UNBOUND_PC_REQUIRES}
+  )
+  set(CFLAGS
+    ${APR_CFLAGS}
+  )
+  set(LIBS
+    ${APR_LDFLAGS}
+    ${APR_LIBRARIES}
+    ${APR_EXTRALIBS}
+    ${APRUTIL_LDFLAGS}
+    ${APRUTIL_LIBRARIES}
+    ${APRUTIL_EXTRALIBS}
+    ${OPENSSL_PC_LIBS}
+    ${ZLIB_PC_LIBS}
+    ${BROTLI_PC_LIBS}
+    ${GSSAPI_PC_LIBS}
+    ${UNBOUND_PC_LIBS}
+    ${SERF_STANDARD_LIBRARIES}
+  )
+  list(REMOVE_DUPLICATES REQUIRES)
+  list(JOIN REQUIRES " " REQUIRES)
+  list(REMOVE_DUPLICATES CFLAGS)
+  list(JOIN CFLAGS " " CFLAGS)
+  list(REMOVE_DUPLICATES LIBS)
+  list(JOIN LIBS " " LIBS)
+  configure_file("build/serf.pc.in" "${SERF_PC_FILE}" @ONLY)
+endfunction()
+
+make_pkgconfig()
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${SERF_PC_FILE}"
+        DESTINATION "${SERF_INSTALL_PKGCONFIG}")
 
 
 if(NOT SKIP_TESTS)
@@ -583,7 +636,7 @@ endif()
 if("SERF_HAVE_SSPI" IN_LIST SERF_C_DEFINES)
   set(_have_sspi ON)
 endif()
-if ("SERF_HAVE_UNBOUND" IN_LIST SERF_C_DEFINES)
+if ("SERF_HAVE_UNBOUND=1" IN_LIST SERF_C_DEFINES)
   set(_have_unbound "EXPERIMENTAL")
 endif()
 
@@ -609,6 +662,5 @@ message(STATUS "    headers: ................ : ${SERF_INSTALL_HEADERS}")
 message(STATUS "    libraries: .............. : ${SERF_INSTALL_LIBRARIES}")
 if(SERF_WINDOWS)
 message(STATUS "    dynamic libraries: ...... : ${SERF_INSTALL_RUNTIME}")
-else()
-message(STATUS "    pkg-config file: ........ : ${SERF_INSTALL_PKGCONFIG}")
 endif()
+message(STATUS "    pkg-config file: ........ : ${SERF_INSTALL_PKGCONFIG}")