From a2334d55fb8e7ed49b8ae69bd253fd9efee63a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Tue, 3 Nov 2026 12:45:40 +0100 Subject: [PATCH 1/2] Enable building ApacheMonitor with CMake --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b114b9f44b2..c866e547267 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -982,13 +982,13 @@ IF(OPENSSL_FOUND) ENDIF() GET_PROPERTY(tmp_includes TARGET ab PROPERTY INCLUDE_DIRECTORIES) -# getting duplicate manifest error with ApacheMonitor -# ADD_EXECUTABLE(ApacheMonitor support/win32/ApacheMonitor.c support/win32/ApacheMonitor.rc) -# SET(install_targets ${install_targets} ApacheMonitor) -# SET(install_bin_pdb ${install_bin_pdb} $) -# SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES WIN32_EXECUTABLE TRUE) -# SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES COMPILE_FLAGS "-DAPP_FILE -DLONG_NAME=ApacheMonitor -DBIN_NAME=ApacheMonitor.exe ${EXTRA_COMPILE_FLAGS}") -# TARGET_LINK_LIBRARIES(ApacheMonitor ${EXTRA_LIBS} ${HTTPD_SYSTEM_LIBS} comctl32 wtsapi32) +ADD_EXECUTABLE(ApacheMonitor support/win32/ApacheMonitor.c support/win32/ApacheMonitor.rc) +SET(install_targets ${install_targets} ApacheMonitor) +SET(install_bin_pdb ${install_bin_pdb} $) +SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES WIN32_EXECUTABLE TRUE) +SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES COMPILE_FLAGS "-DAPP_FILE -DLONG_NAME=ApacheMonitor -DBIN_NAME=ApacheMonitor.exe ${EXTRA_COMPILE_FLAGS}") +SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES LINK_FLAGS "/MANIFEST:NO") # do not emit intermediate manifest +TARGET_LINK_LIBRARIES(ApacheMonitor ${EXTRA_LIBS} ${HTTPD_SYSTEM_LIBS} comctl32 wtsapi32) ########### CONFIGURATION FILES ########### # Set up variables used in the .conf file templates From f55fb35964805bf1ebc7f23e0ac7b1f2ad265ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Tue, 10 Nov 2026 21:52:00 +0100 Subject: [PATCH 2/2] Enable building wintty with CMake --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c866e547267..4e8d0ce46eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -990,6 +990,13 @@ SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES COMPILE_FLAGS "-DAPP_FILE -DLONG_ SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES LINK_FLAGS "/MANIFEST:NO") # do not emit intermediate manifest TARGET_LINK_LIBRARIES(ApacheMonitor ${EXTRA_LIBS} ${HTTPD_SYSTEM_LIBS} comctl32 wtsapi32) +ADD_EXECUTABLE(wintty support/win32/wintty.c build/win32/httpd.rc) +SET(install_targets ${install_targets} wintty) +SET(install_bin_pdb ${install_bin_pdb} $) +SET_TARGET_PROPERTIES(wintty PROPERTIES COMPILE_FLAGS "-DAPP_FILE -DLONG_NAME=wintty -DBIN_NAME=wintty.exe ${EXTRA_COMPILE_FLAGS}") +TARGET_LINK_LIBRARIES(wintty ${EXTRA_LIBS} ${HTTPD_SYSTEM_LIBS}) + + ########### CONFIGURATION FILES ########### # Set up variables used in the .conf file templates SET(LoadModule "${LoadModules}")