more fixes

Author: kassane

CMakeLists.txt

@@ -13,6 +13,14 @@ project(facil-io VERSION 0.8.0
 set(LIB_ROOT lib)
 set(LIB_CONCAT_FOLDER fio-stl)
 include_directories(".")
+
+include(CheckLibraryExists)
+include(CheckStructHasMember)
+include(CheckTypeSize)
+include(FeatureSummary)
+include(CheckCXXCompilerFlag)
+include(CheckCSourceCompiles)
+
 find_library(MATH_LIBRARY m)
 
 # default value of ${CMAKE_BUILD_TYPE} is Debug 
@@ -30,7 +38,6 @@ option(FACIL_EXAMPLES_BUILD "Build Examples" OFF)
 option(FACIL_TESTS_BUILD "Build Tests" OFF)
 
 # Detect endianess
-include(CheckTypeSize)
 check_type_size("void*" SIZE_OF_POINTER)
 if(${SIZE_OF_POINTER} EQUAL 8)
     set(FLAGS "__BIG_ENDIAN__")
@@ -48,11 +55,9 @@ if(FACIL_ENABLE_SODIUM)
 endif()
 
 # Detect 'struct tm' fields
-include(CheckStructHasMember)
 check_struct_has_member("struct tm" tm_zone time.h HAVE_TM_TM_ZONE)
 
 # Detect SystemV socket libraries
-include(CheckLibraryExists)
 check_library_exists(socket connect "" HAVE_SOCKET)
 check_library_exists(nsl gethostname "" HAVE_NSL)
 if(HAVE_SOCKET AND HAVE_NSL)
@@ -65,7 +70,6 @@ set(HAVE_SENDFILE FALSE)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     # Detect the `sendfile` system call for Linux
     if(NOT HAVE_SENDFILE)
-        include(CheckCSourceCompiles)
         check_c_source_compiles("
         #define _GNU_SOURCE
         #include <stdlib.h>
@@ -242,11 +246,19 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
         # Add sanitizers for GNU compilers (GCC or Clang)
         set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -fstack-protector-all -g -DMALLOC_CHECK_=3 -DTRACE_IS_ON=1 -O0 -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer")
         set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fsanitize=address -fsanitize=undefined")
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
     endif()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DEBUG_FLAGS}")
 else()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${RELEASE_FLAGS}")
 endif()
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    CHECK_CXX_COMPILER_FLAG("-stdlib=libc++" COMPILER_SUPPORTS_STATIC_CLANG)
+    if(COMPILER_SUPPORTS_STATIC_CLANG)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+    endif()
+endif()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
 
 # Create the library target
 if(FACIL_SHARED_BUILD)
@@ -315,7 +327,7 @@ if(FACIL_EXAMPLES_BUILD)
     set(EXAMPLES
         array
         bstr
-        # chat
+        chat
         client
         fiobj
         map
@@ -355,12 +367,12 @@ if(FACIL_TESTS_BUILD)
         # array
         base64
         # cpp
-        # http1-parser-old
-        # http1-parser
-        # json
-        # json_find
-        # json_minify
-        # malloc
+        http1-parser-old
+        http1-parser
+        json
+        json_find
+        json_minify
+        malloc
         mempool
         mustache
         noop
@@ -376,3 +388,4 @@ if(FACIL_TESTS_BUILD)
         build_and_run_test(${TEST})
     endforeach()
 endif()
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)