Add support to decompress xz files

[thirdparty/sarg.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14582fe05a03e7bf2d636b362d78285d25c176c5..d2d99606395e1a2049f7f79f5a25a41ce2a336c0 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
 CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
 PROJECT(sarg C)
 SET(sarg_VERSION 2)
-SET(sarg_REVISION "4-pre1")
+SET(sarg_REVISION "4.0-pre2")
 SET(sarg_BUILD "")
-SET(sarg_BUILDDATE "Jul-16-2012")
+SET(sarg_BUILDDATE "Mar-19-2015")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)
@@ -49,10 +49,13 @@ SET(SRC util.c log.c report.c topuser.c email.c sort.c html.c
        index.c getconf.c usage.c decomp.c ip2name.c ip2name_dns.c
        useragent.c exclude.c convlog.c totday.c repday.c datafile.c
        indexonly.c splitlog.c lastlog.c topsites.c siteuser.c css.c
-       smartfilter.c denied.c authfail.c charset.c dichotomic.c
+       smartfilter.c denied.c authfail.c dichotomic.c
        redirector.c auth.c download.c grepday.c ip2name_exec.c
        dansguardian_log.c dansguardian_report.c realtime.c btree_cache.c
-       usertab.c userinfo.c longline.c url.c readlog.c)
+       usertab.c userinfo.c longline.c url.c fnmatch.c stringbuffer.c
+       filelist.c readlog.c alias.c
+          readlog_squid.c readlog_sarg.c readlog_extlog.c readlog_common.c
+          include/conf.h include/info.h include/defs.h include/stringbuffer.h)
 
 FOREACH(f ${SRC})
    ADD_FILE_DEPENDENCIES(${f} ${CMAKE_BINARY_DIR}/config.h ${CMAKE_SOURCE_DIR}/include/conf.h ${CMAKE_SOURCE_DIR}/include/info.h ${CMAKE_SOURCE_DIR}/include/defs.h)
@@ -115,16 +118,23 @@ CHECK_INCLUDE_FILE(libgen.h HAVE_LIBGEN_H)
 CHECK_INCLUDE_FILE(stdbool.h HAVE_STDBOOL_H)
 CHECK_INCLUDE_FILE(getopt.h HAVE_GETOPT_H)
 CHECK_INCLUDE_FILE(fcntl.h HAVE_FCNTL_H)
+CHECK_INCLUDE_FILE(fnmatch.h HAVE_FNMATCH_H)
+CHECK_INCLUDE_FILE(glob.h HAVE_GLOB_H)
 
 IF(!HAVE_GETOPT_H)
    MESSAGE(SEND_ERROR "getopt.h is required to compile sarg")
 ENDIF(!HAVE_GETOPT_H)
 
+# Required libraries
+TARGET_LINK_LIBRARIES(sarg m)
+
 # Windows need lib wsock32 and ws2_32
 IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+   CHECK_INCLUDE_FILE(winsock2.h HAVE_WINSOCK2_H)
    CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
    CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H)
    CHECK_INCLUDE_FILE(ws2tcpip.h HAVE_WS2TCPIP_H)
+   CHECK_INCLUDE_FILE(direct.h HAVE_DIRECT_H)
 
    FIND_LIBRARY(WSOCK_LIB NAMES wsock32 DOC "The winsock library")
    IF(WSOCK_LIB)
@@ -141,13 +151,13 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
    ADD_DEFINITIONS(-DWINDOWS)
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-CHECK_FUNCTION_EXISTS(bzero HAVE_BZERO)
 CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
 CHECK_FUNCTION_EXISTS(symlink HAVE_SYMLINK)
 CHECK_FUNCTION_EXISTS(lstat HAVE_LSTAT)
 CHECK_FUNCTION_EXISTS(getnameinfo HAVE_GETNAMEINFO)
 CHECK_FUNCTION_EXISTS(getaddrinfo HAVE_GETADDRINFO)
 CHECK_FUNCTION_EXISTS(inet_aton HAVE_INET_ATON)
+CHECK_FUNCTION_EXISTS(fnmatch HAVE_FNMATCH)
 
 CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage" ss_len sys/socket.h HAVE_SOCKADDR_SA_LEN)
 
@@ -341,7 +351,8 @@ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "solaris")
 OPTION(ENABLE_EXTRA_PROTECT "Enable compile and runtime extra protections" OFF)
 IF(ENABLE_EXTRA_PROTECT)
    GET_TARGET_PROPERTY(TMPCFLAGS sarg COMPILE_FLAGS)
-   SET_TARGET_PROPERTIES(sarg PROPERTIES COMPILE_FLAGS "${TMPCFLAGS} -fstack-protector -D_FORTIFY_SOURCE=2 -Werror")
+   # _FORTIFY_SOURCE may have been defined by the system. It must be undefined before it is changed to the value we want.
+   SET_TARGET_PROPERTIES(sarg PROPERTIES COMPILE_FLAGS "${TMPCFLAGS} -fstack-protector -U _FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Werror")
 
    CHECK_C_COMPILER_FLAG("-Wformat -Werror=format-security" HAVE_WERROR_FORMAT_SECURITY)
    IF(HAVE_WERROR_FORMAT_SECURITY)
@@ -385,5 +396,5 @@ SET(CPACK_PACKAGE_VERSION_MINOR "${sarg_REVISION}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${sarg_BUILD}")
 SET(CPACK_GENERATOR TGZ)
 SET(CPACK_SOURCE_GENERATOR TGZ)
-SET(CPACK_SOURCE_IGNORE_FILES "/.svn/" "/debian/" "/html/" "Makefile$" "config\\\\.log$" "config\\\\.status$" ".*~$" "\\\\.o$")
+SET(CPACK_SOURCE_IGNORE_FILES "/.git/" "/debian/" "/html/" "Makefile$" "config\\\\.log$" "config\\\\.status$" ".*~$" "\\\\.o$")
 INCLUDE(CPack)