You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jf...@apache.org on 2024/01/26 16:15:18 UTC
svn commit: r1915413 - /httpd/httpd/trunk/CMakeLists.txt
Author: jfclere
Date: Fri Jan 26 16:15:18 2024
New Revision: 1915413
URL: http://svn.apache.org/viewvc?rev=1915413&view=rev
Log:
ab needs an additional Ws2_32.lib (like abs)
Modified:
httpd/httpd/trunk/CMakeLists.txt
Modified: httpd/httpd/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1915413&r1=1915412&r2=1915413&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Fri Jan 26 16:15:18 2024
@@ -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} $<TARGET_PDB_FILE:ab>)
+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)