security-and-privacy/uts-server
security-and-privacy/uts-server
1
0
Fork 0
mirror of https://github.com/kakwa/uts-server synced 2024-12-04 23:15:54 +01:00
Code Issues Releases Wiki Activity

fix civetweb bundling + version bump + changelog

Browse Source
This commit is contained in:
kakwa 2017-11-04 13:11:33 +01:00
parent 550f44d8c2
commit 70f54cfd11
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.6)
project (uts-server) project (uts-server)
include(ExternalProject) include(ExternalProject)
set(VERSION 0.1.8) set(VERSION 0.1.9)
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)
@ -13,11 +13,19 @@ option(CIVETWEB_CUST_ARGS "Custom args for civetweb (if civetweb is bundled)" ""
option(LINK_PTHREAD "link pthread" OFF) option(LINK_PTHREAD "link pthread" OFF)
IF("$ENV{CIVETWEB_GITURL}" STREQUAL "") IF("$ENV{CIVETWEB_GITURL}" STREQUAL "")
set(CIVETWEB_GITURL "https://github.com/kakwa/civetweb") set(CIVETWEB_GITURL "https://github.com/civetweb/civetweb")
ELSE() ELSE()
set(CIVETWEB_GITURL "$ENV{CIVETWEB_GITURL}") set(CIVETWEB_GITURL "$ENV{CIVETWEB_GITURL}")
ENDIF() ENDIF()
IF("$ENV{CIVETWEB_GITTAG}" STREQUAL "")
set(CIVETWEB_GITTAG "v1.10")
ELSE()
set(CIVETWEB_GITTAG "$ENV{CIVETWEB_GITTAG}")
ENDIF()
IF(STATIC) IF(STATIC)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
@ -92,9 +100,13 @@ if(BUNDLE_CIVETWEB)
MESSAGE(STATUS "Building Civetweb From: ${CIVETWEB_GITURL}") MESSAGE(STATUS "Building Civetweb From: ${CIVETWEB_GITURL}")
ExternalProject_Add( civetweb ExternalProject_Add( civetweb
GIT_REPOSITORY ${CIVETWEB_GITURL} GIT_REPOSITORY ${CIVETWEB_GITURL}
GIT_TAG ${CIVETWEB_GITTAG}
PATCH_COMMAND sed -i ${SED_FREEBSD} s/__DATE__/"110973"/ src/main.c src/civetweb.c PATCH_COMMAND sed -i ${SED_FREEBSD} s/__DATE__/"110973"/ src/main.c src/civetweb.c
INSTALL_DIR /usr/local INSTALL_DIR /usr/local
CMAKE_ARGS .. -DCMAKE_INSTALL_PREFIX=/usr CMAKE_ARGS .. -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_C_FLAGS="-Wno-incompatible-pointer-types"
-DCIVETWEB_ENABLE_CXX=OFF -DCIVETWEB_ENABLE_CXX=OFF
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=OFF
-DCIVETWEB_DISABLE_CGI=ON -DCIVETWEB_DISABLE_CGI=ON
@ -105,6 +117,7 @@ if(BUNDLE_CIVETWEB)
-DCIVETWEB_SSL_OPENSSL_API_1_1=${OPENSSL_API_1_1} -DCIVETWEB_SSL_OPENSSL_API_1_1=${OPENSSL_API_1_1}
-DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS} -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS}
-DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF
-DCIVETWEB_ALLOW_WARNINGS=ON
${CIVETWEB_CUST_ARGS} ${CIVETWEB_CUST_ARGS}
INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_SOURCE_DIR}/vendor/ INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_SOURCE_DIR}/vendor/
) )

8
ChangeLog.rst
View File

@ -1,6 +1,14 @@
Changelogs Changelogs
========== ==========
0.1.9
-----
* [fix ] point to upstream civetweb (forked civetweb now removed)
* [fix ] disable some compiler warnings to allow civetweb compilation
* [impr] add possibility to specify which tag used for civetweb bundling
* [impr] use same compiler for uts-server and civetweb when bundling
0.1.8 0.1.8
----- -----