"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "CMakeLists.txt" between
sarg-2.3.11.tar.gz and sarg-2.4.0.tar.gz

About: SARG ia a Squid Analysis Report Generator.

CMakeLists.txt  (sarg-2.3.11):CMakeLists.txt  (sarg-2.4.0)
CMAKE_MINIMUM_REQUIRED (VERSION 2.6) CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
PROJECT(sarg C) PROJECT(sarg C)
SET(sarg_VERSION 2) SET(sarg_VERSION 2)
SET(sarg_REVISION "3.11") SET(sarg_REVISION "4.0")
SET(sarg_BUILD "") SET(sarg_BUILD "")
SET(sarg_BUILDDATE "Jan-14-2018") SET(sarg_BUILDDATE "Jan-16-2020")
INCLUDE(AddFileDependencies) INCLUDE(AddFileDependencies)
INCLUDE(CheckIncludeFile) INCLUDE(CheckIncludeFile)
INCLUDE(CheckLibraryExists) INCLUDE(CheckLibraryExists)
INCLUDE(CheckFunctionExists) INCLUDE(CheckFunctionExists)
INCLUDE(CheckTypeSize) INCLUDE(CheckTypeSize)
INCLUDE(CheckSymbolExists) INCLUDE(CheckSymbolExists)
INCLUDE(CheckCCompilerFlag) INCLUDE(CheckCCompilerFlag)
INCLUDE(CheckStructHasMember) INCLUDE(CheckStructHasMember)
DEFINE_PROPERTY(GLOBAL PROPERTY enable-htmldir BRIEF_DOCS "--enable-htmldir=html dir" DEFINE_PROPERTY(GLOBAL PROPERTY enable-htmldir BRIEF_DOCS "--enable-htmldir=html dir"
skipping to change at line 51 skipping to change at line 52
SET(IMAGEDIR "share/sarg/images" CACHE PATH "The directory to copy the images fi les relative to the install directory") SET(IMAGEDIR "share/sarg/images" CACHE PATH "The directory to copy the images fi les relative to the install directory")
SET(SARGPHPDIR "share/sarg/sarg-php" CACHE PATH "The directory to copy sarg-php relative to the install directory") SET(SARGPHPDIR "share/sarg/sarg-php" CACHE PATH "The directory to copy sarg-php relative to the install directory")
# Sources to compile # Sources to compile
INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}") #Make it find this config.h before th e one in src/include INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}") #Make it find this config.h before th e one in src/include
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
SET(SRC util.c log.c report.c topuser.c email.c sort.c html.c 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 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 useragent.c exclude.c convlog.c totday.c repday.c datafile.c
indexonly.c splitlog.c lastlog.c topsites.c siteuser.c css.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 redirector.c auth.c download.c grepday.c ip2name_exec.c
dansguardian_log.c dansguardian_report.c realtime.c btree_cache.c dansguardian_log.c dansguardian_report.c realtime.c btree_cache.c
usertab.c userinfo.c longline.c url.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}) FOREACH(f ${SRC})
ADD_FILE_DEPENDENCIES(${f} ${CMAKE_BINARY_DIR}/config.h ${CMAKE_SOURCE_DIR}/i nclude/conf.h ${CMAKE_SOURCE_DIR}/include/info.h ${CMAKE_SOURCE_DIR}/include/def s.h) ADD_FILE_DEPENDENCIES(${f} ${CMAKE_BINARY_DIR}/config.h ${CMAKE_SOURCE_DIR}/i nclude/conf.h ${CMAKE_SOURCE_DIR}/include/info.h ${CMAKE_SOURCE_DIR}/include/def s.h)
ENDFOREACH(f) ENDFOREACH(f)
ADD_EXECUTABLE(sarg ${SRC}) ADD_EXECUTABLE(sarg ${SRC})
SET_TARGET_PROPERTIES(sarg PROPERTIES VERSION "${sarg_VERSION}.${sarg_REVISION}. ${sarg_BUILD}") SET_TARGET_PROPERTIES(sarg PROPERTIES VERSION "${sarg_VERSION}.${sarg_REVISION}. ${sarg_BUILD}")
SET_TARGET_PROPERTIES(sarg PROPERTIES COMPILE_FLAGS "$ENV{CFLAGS} -Wall -Wno-sig n-compare") SET_TARGET_PROPERTIES(sarg PROPERTIES COMPILE_FLAGS "$ENV{CFLAGS} -Wall -Wno-sig n-compare")
skipping to change at line 117 skipping to change at line 121
CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H) CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
CHECK_INCLUDE_FILE(limits.h HAVE_LIMITS_H) CHECK_INCLUDE_FILE(limits.h HAVE_LIMITS_H)
CHECK_INCLUDE_FILE(math.h HAVE_MATH_H) CHECK_INCLUDE_FILE(math.h HAVE_MATH_H)
CHECK_INCLUDE_FILE(locale.h HAVE_LOCALE_H) CHECK_INCLUDE_FILE(locale.h HAVE_LOCALE_H)
CHECK_INCLUDE_FILE(execinfo.h HAVE_EXECINFO_H) CHECK_INCLUDE_FILE(execinfo.h HAVE_EXECINFO_H)
CHECK_INCLUDE_FILE(libintl.h HAVE_LIBINTL_H) CHECK_INCLUDE_FILE(libintl.h HAVE_LIBINTL_H)
CHECK_INCLUDE_FILE(libgen.h HAVE_LIBGEN_H) CHECK_INCLUDE_FILE(libgen.h HAVE_LIBGEN_H)
CHECK_INCLUDE_FILE(stdbool.h HAVE_STDBOOL_H) CHECK_INCLUDE_FILE(stdbool.h HAVE_STDBOOL_H)
CHECK_INCLUDE_FILE(getopt.h HAVE_GETOPT_H) CHECK_INCLUDE_FILE(getopt.h HAVE_GETOPT_H)
CHECK_INCLUDE_FILE(fcntl.h HAVE_FCNTL_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) IF(!HAVE_GETOPT_H)
MESSAGE(SEND_ERROR "getopt.h is required to compile sarg") MESSAGE(SEND_ERROR "getopt.h is required to compile sarg")
ENDIF(!HAVE_GETOPT_H) ENDIF(!HAVE_GETOPT_H)
# Required libraries # Required libraries
TARGET_LINK_LIBRARIES(sarg m) TARGET_LINK_LIBRARIES(sarg m)
# Windows need lib wsock32 and ws2_32 # Windows need lib wsock32 and ws2_32
IF(CMAKE_SYSTEM_NAME STREQUAL "Windows") 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(windows.h HAVE_WINDOWS_H)
CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H) CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H)
CHECK_INCLUDE_FILE(ws2tcpip.h HAVE_WS2TCPIP_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") FIND_LIBRARY(WSOCK_LIB NAMES wsock32 DOC "The winsock library")
IF(WSOCK_LIB) IF(WSOCK_LIB)
TARGET_LINK_LIBRARIES(sarg wsock32) TARGET_LINK_LIBRARIES(sarg wsock32)
LIST(APPEND CMAKE_REQUIRED_LIBRARIES wsock32) LIST(APPEND CMAKE_REQUIRED_LIBRARIES wsock32)
ENDIF(WSOCK_LIB) ENDIF(WSOCK_LIB)
FIND_LIBRARY(WSOCK2_LIB NAMES ws2_32 DOC "The winsock 2 library") FIND_LIBRARY(WSOCK2_LIB NAMES ws2_32 DOC "The winsock 2 library")
IF(WSOCK2_LIB) IF(WSOCK2_LIB)
TARGET_LINK_LIBRARIES(sarg ws2_32) TARGET_LINK_LIBRARIES(sarg ws2_32)
LIST(APPEND CMAKE_REQUIRED_LIBRARIES ws2_32) LIST(APPEND CMAKE_REQUIRED_LIBRARIES ws2_32)
ENDIF(WSOCK2_LIB) ENDIF(WSOCK2_LIB)
ADD_DEFINITIONS(-DWINDOWS) ADD_DEFINITIONS(-DWINDOWS)
ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Windows") ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
CHECK_FUNCTION_EXISTS(bzero HAVE_BZERO)
CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE) CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
CHECK_FUNCTION_EXISTS(symlink HAVE_SYMLINK) CHECK_FUNCTION_EXISTS(symlink HAVE_SYMLINK)
CHECK_FUNCTION_EXISTS(lstat HAVE_LSTAT) CHECK_FUNCTION_EXISTS(lstat HAVE_LSTAT)
CHECK_FUNCTION_EXISTS(getnameinfo HAVE_GETNAMEINFO) CHECK_FUNCTION_EXISTS(getnameinfo HAVE_GETNAMEINFO)
CHECK_FUNCTION_EXISTS(getaddrinfo HAVE_GETADDRINFO) CHECK_FUNCTION_EXISTS(getaddrinfo HAVE_GETADDRINFO)
CHECK_FUNCTION_EXISTS(inet_aton HAVE_INET_ATON) 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_SOCKA DDR_SA_LEN) CHECK_STRUCT_HAS_MEMBER("struct sockaddr_storage" ss_len sys/socket.h HAVE_SOCKA DDR_SA_LEN)
# Find gd # Find gd
CHECK_INCLUDE_FILE(gd.h HAVE_GD_H) CHECK_INCLUDE_FILE(gd.h HAVE_GD_H)
IF(HAVE_GD_H) IF(HAVE_GD_H)
CHECK_INCLUDE_FILE(gdfontl.h HAVE_GDFONTL_H) CHECK_INCLUDE_FILE(gdfontl.h HAVE_GDFONTL_H)
CHECK_INCLUDE_FILE(gdfontt.h HAVE_GDFONTT_H) CHECK_INCLUDE_FILE(gdfontt.h HAVE_GDFONTT_H)
CHECK_INCLUDE_FILE(gdfonts.h HAVE_GDFONTS_H) CHECK_INCLUDE_FILE(gdfonts.h HAVE_GDFONTS_H)
CHECK_INCLUDE_FILE(gdfontmb.h HAVE_GDFONTMB_H) CHECK_INCLUDE_FILE(gdfontmb.h HAVE_GDFONTMB_H)
skipping to change at line 391 skipping to change at line 399
INSTALL(DIRECTORY fonts/ DESTINATION "${FONTDIR}" FILES_MATCHING PATTERN "*.ttf" PATTERN ".svn" EXCLUDE) INSTALL(DIRECTORY fonts/ DESTINATION "${FONTDIR}" FILES_MATCHING PATTERN "*.ttf" PATTERN ".svn" EXCLUDE)
INSTALL(DIRECTORY sarg-php/ DESTINATION "${SARGPHPDIR}" PATTERN ".svn" EXCLUDE) INSTALL(DIRECTORY sarg-php/ DESTINATION "${SARGPHPDIR}" PATTERN ".svn" EXCLUDE)
# Package creation # Package creation
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Squid Analysis Report Generator") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Squid Analysis Report Generator")
SET(CPACK_PACKAGE_VERSION_MAJOR "${sarg_VERSION}") SET(CPACK_PACKAGE_VERSION_MAJOR "${sarg_VERSION}")
SET(CPACK_PACKAGE_VERSION_MINOR "${sarg_REVISION}") SET(CPACK_PACKAGE_VERSION_MINOR "${sarg_REVISION}")
SET(CPACK_PACKAGE_VERSION_PATCH "${sarg_BUILD}") SET(CPACK_PACKAGE_VERSION_PATCH "${sarg_BUILD}")
SET(CPACK_GENERATOR TGZ) SET(CPACK_GENERATOR TGZ)
SET(CPACK_SOURCE_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) INCLUDE(CPack)
 End of changes. 10 change blocks. 
6 lines changed or deleted 14 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)