Skip to content

[2.4.x] Backport ApacheMonitor and wintty support in CMake #1026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jajik wants to merge 2 commits into
base: 2.4.x
Choose a base branch
from
+14 −7
Open

[2.4.x] Backport ApacheMonitor and wintty support in CMake #1026

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2334d5
Enable building ApacheMonitor with CMake
jajik Nov 3, 2026
f55fb35
Enable building wintty with CMake
jajik Nov 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,13 +982,20 @@ 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} $<TARGET_PDB_FILE:ApacheMonitor>)
# 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} $<TARGET_PDB_FILE:ApacheMonitor>)
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)

ADD_EXECUTABLE(wintty support/win32/wintty.c build/win32/httpd.rc)
SET(install_targets ${install_targets} wintty)
SET(install_bin_pdb ${install_bin_pdb} $<TARGET_PDB_FILE:wintty>)
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
Expand Down
Loading