security-and-privacy/uts-server
security-and-privacy/uts-server
1
0
Fork 0
mirror of https://github.com/kakwa/uts-server synced 2025-01-26 05:17:26 +01:00
Code Issues Releases Wiki Activity

fix option and documentation + changelog

Browse Source
This commit is contained in:
kakwa 2017-01-31 01:26:51 +01:00
parent 68017436dd
commit b46a456e2e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -7,10 +7,10 @@ set(VERSION 0.1.6)
option(DEBUG "compile with debug symbol" OFF) option(DEBUG "compile with debug symbol" OFF)
option(BUNDLE_CIVETWEB "bundle civetweb with uts-server" OFF) option(BUNDLE_CIVETWEB "bundle civetweb with uts-server" OFF)
option(STATIC "static linked binary" OFF) option(STATIC "static linked binary" OFF)
option(LINK_DL "dynamicaly link dl" OFF) option(LINK_DL "link dl" OFF)
option(LINK_GCC_S "dynamicaly link gcc_s" OFF) option(LINK_GCC_S "link gcc_s" OFF)
option(CIVETWEB_CUST_ARGS "Custom args for civetweb (if civetweb is bundled)" "") option(CIVETWEB_CUST_ARGS "Custom args for civetweb (if civetweb is bundled)" "")
option(LINK_PTHREAD "dynamicaly link pthread" OFF) option(LINK_PTHREAD "link pthread" OFF)
IF(STATIC) IF(STATIC)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")

2
ChangeLog.rst
View File

@ -5,6 +5,8 @@ Changelogs
----- -----
* [fix ] option declaration for LINK_GCC_S * [fix ] option declaration for LINK_GCC_S
* [doc ] add warnings to explicitely state the BUNDLE_CIVETWEB option as test/dev only
* [impr] add option for easily linking lib pthread (mainly for static linking)
0.1.5 0.1.5
----- -----

4
docs/install.rst
View File

@ -42,8 +42,8 @@ uts-server is compiled using cmake:
# Compile statically # Compile statically
# (in some cases, it might be necessary to still # (in some cases, it might be necessary to still
# link some libraries like dl or gcc_s or pthread, if necessary, # link some libraries like dl or gcc_s or pthread, if necessary,
# add -DDL_LINK=ON and/or -DGCC_S_LINK=ON -DPTHREAD_LINK=ON) # add -DLINK_DL=ON and/or -DLINK_GCC_S=ON and/or -DLINK_PTHREAD=ON)
$ cmake . -DSTATIC=ON # -DDL_LINK=ON -DGCC_S_LINK=ON -DPTHREAD_LINK=ON $ cmake . -DSTATIC=ON # -DLINK_DL=ON -DLINK_GCC_S=ON -DLINK_PTHREAD=ON
$ make $ make
.. warning:: .. warning::