From 70f54cfd11d2d3f14690fd4962043965b18319fb Mon Sep 17 00:00:00 2001
From: kakwa <carpentier.pf@gmail.com>
Date: Sat, 4 Nov 2017 13:11:33 +0100
Subject: [PATCH] fix civetweb bundling + version bump + changelog

---
 CMakeLists.txt | 17 +++++++++++++++--
 ChangeLog.rst  |  8 ++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5c4826..1dc4ac9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.6)
 project (uts-server)
 include(ExternalProject)
 
-set(VERSION 0.1.8)
+set(VERSION 0.1.9)
 
 option(DEBUG              "compile with debug symbol"    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)
 
 IF("$ENV{CIVETWEB_GITURL}" STREQUAL "")
-    set(CIVETWEB_GITURL    "https://github.com/kakwa/civetweb")
+    set(CIVETWEB_GITURL    "https://github.com/civetweb/civetweb")
 ELSE()
     set(CIVETWEB_GITURL    "$ENV{CIVETWEB_GITURL}")
 ENDIF()
 
+IF("$ENV{CIVETWEB_GITTAG}" STREQUAL "")
+    set(CIVETWEB_GITTAG    "v1.10")
+ELSE()
+    set(CIVETWEB_GITTAG    "$ENV{CIVETWEB_GITTAG}")
+ENDIF()
+
+
+
 IF(STATIC)
     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
@@ -92,9 +100,13 @@ if(BUNDLE_CIVETWEB)
     MESSAGE(STATUS "Building Civetweb From: ${CIVETWEB_GITURL}")
     ExternalProject_Add( civetweb
        GIT_REPOSITORY ${CIVETWEB_GITURL}
+       GIT_TAG ${CIVETWEB_GITTAG}
        PATCH_COMMAND sed -i ${SED_FREEBSD} s/__DATE__/"110973"/ src/main.c src/civetweb.c
        INSTALL_DIR /usr/local
        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
         -DBUILD_SHARED_LIBS=OFF
         -DCIVETWEB_DISABLE_CGI=ON
@@ -105,6 +117,7 @@ if(BUNDLE_CIVETWEB)
         -DCIVETWEB_SSL_OPENSSL_API_1_1=${OPENSSL_API_1_1}
         -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS}
         -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF
+        -DCIVETWEB_ALLOW_WARNINGS=ON
         ${CIVETWEB_CUST_ARGS}
        INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_SOURCE_DIR}/vendor/
     )
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 422cf14..6dc2b8f 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,14 @@
 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
 -----