From 309770904dda9c6d7ea91cf36ca5825db62f9840 Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Fri, 26 Jan 2024 16:15:18 +0000 Subject: [PATCH] ab needs an additional Ws2_32.lib (like abs) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915413 13f79535-47bb-0310-9956-ffa450edef68 --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 869f72173f5..538dc5ad361 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -935,7 +935,6 @@ SET_TARGET_PROPERTIES(httpd PROPERTIES TARGET_LINK_LIBRARIES(httpd libhttpd ${EXTRA_LIBS}) SET(standard_support - ab htcacheclean htdbm htdigest @@ -958,6 +957,15 @@ FOREACH(pgm ${standard_support}) TARGET_LINK_LIBRARIES(${pgm} ${EXTRA_LIBS} ${APR_LIBRARIES}) ENDFOREACH() +ADD_EXECUTABLE(ab support/ab.c build/win32/httpd.rc) +SET(install_targets ${install_targets} ab) +SET(install_bin_pdb ${install_bin_pdb} $) +SET(tmp_includes ${HTTPD_INCLUDE_DIRECTORIES}) +SET_TARGET_PROPERTIES(ab PROPERTIES INCLUDE_DIRECTORIES "${tmp_includes}") +DEFINE_WITH_BLANKS(define_long_name "LONG_NAME" "Apache HTTP Server ab program") +SET_TARGET_PROPERTIES(ab PROPERTIES COMPILE_FLAGS "-DAPP_FILE ${define_long_name} -DBIN_NAME=ab.exe ${EXTRA_COMPILE_FLAGS}") +TARGET_LINK_LIBRARIES(ab ${EXTRA_LIBS} ${APR_LIBRARIES} Ws2_32.lib) + IF(OPENSSL_FOUND) ADD_EXECUTABLE(abs support/ab.c build/win32/httpd.rc) SET(install_targets ${install_targets} abs) @@ -969,7 +977,6 @@ IF(OPENSSL_FOUND) SET_TARGET_PROPERTIES(abs PROPERTIES COMPILE_FLAGS "-DAPP_FILE ${define_long_name} -DBIN_NAME=abs.exe ${EXTRA_COMPILE_FLAGS}") TARGET_LINK_LIBRARIES(abs ${EXTRA_LIBS} ${APR_LIBRARIES} ${OPENSSL_LIBRARIES} Ws2_32.lib) ENDIF() -GET_PROPERTY(tmp_includes TARGET ab PROPERTY INCLUDE_DIRECTORIES) # Unit Test Suite IF(CHECK_FOUND)