From b46a456e2ea38e302a68ed88e510de14f559187e Mon Sep 17 00:00:00 2001 From: kakwa Date: Tue, 31 Jan 2017 01:26:51 +0100 Subject: [PATCH] fix option and documentation + changelog --- CMakeLists.txt | 6 +++--- ChangeLog.rst | 2 ++ docs/install.rst | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bbeb006..84734f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,10 +7,10 @@ set(VERSION 0.1.6) option(DEBUG "compile with debug symbol" OFF) option(BUNDLE_CIVETWEB "bundle civetweb with uts-server" OFF) option(STATIC "static linked binary" OFF) -option(LINK_DL "dynamicaly link dl" OFF) -option(LINK_GCC_S "dynamicaly link gcc_s" OFF) +option(LINK_DL "link dl" OFF) +option(LINK_GCC_S "link gcc_s" OFF) 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) set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") diff --git a/ChangeLog.rst b/ChangeLog.rst index 0849be3..a29f3e1 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -5,6 +5,8 @@ Changelogs ----- * [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 ----- diff --git a/docs/install.rst b/docs/install.rst index bee9177..f623a42 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -42,8 +42,8 @@ uts-server is compiled using cmake: # Compile statically # (in some cases, it might be necessary to still # 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) - $ cmake . -DSTATIC=ON # -DDL_LINK=ON -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 # -DLINK_DL=ON -DLINK_GCC_S=ON -DLINK_PTHREAD=ON $ make .. warning::