c/civetweb
1
0
Fork 0
mirror of https://github.com/civetweb/civetweb synced 2025-03-28 21:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow disabling executable install.

Browse Source 
This keeps previous functionality by having executable installation on by
default. It also tries to mitigate the ability to "screw it up" by only
allowing users that have made themselves advanced to disable installing
the executable.

See: https://cmake.org/cmake/help/v3.9/command/mark_as_advanced.html

Closes #505.
This commit is contained in:
Braedy Kuzma 2017-08-18 10:20:53 -06:00
parent 9ec3c463f5
commit 2462470e35
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -98,6 +98,11 @@ message(STATUS "Force x32 / x64 architecture - ${CIVETWEB_ARCH}")
option(CIVETWEB_ENABLE_LUA "Enable Lua CGIs" OFF)
message(STATUS "Lua CGI support - ${CIVETWEB_ENABLE_LUA}")
# Enable installing CivetWeb executables
option(CIVETWEB_INSTALL_EXECUTABLE "Enable installing CivetWeb executable" ON)
mark_as_advanced(FORCE CIVETWEB_INSTALL_EXECUTABLE) # Advanced users can disable
message(STATUS "Executable installation - ${CIVETWEB_INSTALL_EXECUTABLE}")
# Allow builds to complete with warnings (do not set -Werror)
if (LINUX)
# CivetWeb Linux support is stable: Builds must be free from warnings.

16
src/CMakeLists.txt
View File

@ -233,12 +233,14 @@ add_executable(c-executable main.c)
set_target_properties(c-executable PROPERTIES
OUTPUT_NAME "civetweb"
)
install(
TARGETS c-executable
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
COMPONENT server)
if (CIVETWEB_INSTALL_EXECUTABLE)
install(
TARGETS c-executable
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
COMPONENT server)
endif()
if (BUILD_SHARED_LIBS)
target_compile_definitions(c-executable PRIVATE CIVETWEB_DLL_IMPORTS)
endif()
@ -265,7 +267,7 @@ if (CIVETWEB_ENABLE_LUA)
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
COMPONENT lua-library)
COMPONENT lua-library)
endif()
# The C++ API library