New upstream version 1.8.1

1 files changed, 24 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 993a996..5cbd06a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 # NOTES: Defaults to build type of Shared
 #        Forces out-of-source tree build
-#        
+#
 #
 # This file started on 18 January 2010 by Gregory Hellings
 # It is ceded to The SWORD Library developers and CrossWire under the terms
@@ -14,7 +14,7 @@
 # not, then this file is released under the GPLv2 by myself.
 PROJECT(libsword CXX C)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-SET(SWORD_VERSION 1.7.4)
+SET(SWORD_VERSION 1.8.1)
 
 # Make sure it's an out-of-stream build
 IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
@@ -32,6 +32,8 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/options.cmake")
 # Source variables
 INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/sources.cmake")
+# Cppcheck
+INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CppcheckTargets.cmake")
 # Our local includes
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/include") # For swversion.h
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/include") # For everything else
@@ -59,8 +61,6 @@ ELSE(MSVC)
 ENDIF(MSVC)
 FIND_PACKAGE(CLucene QUIET)
 FIND_PACKAGE(ZLIB QUIET)
-FIND_PACKAGE(ICU QUIET)
-FIND_PACKAGE(CURL QUIET)
 FIND_PACKAGE(PkgConfig QUIET)
 FIND_PACKAGE(Regex QUIET)
 
@@ -79,8 +79,12 @@ INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/muxsources.cmake)
 # Most of the work for configuration is done above, already.
 #
 # I want to do this manually, there might be reason in the future
+SET(CPPCHECK_POSSIBLEERROR_ARG "--enable=all")
 IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE)
 	ADD_LIBRARY(sword SHARED ${sword_SOURCES})
+    ADD_CPPCHECK(sword
+        POSSIBLE_ERROR TRUE
+        FORCE TRUE)
 	MESSAGE(STATUS "Building Shared library.")
 	SET(BUILDING_SHARED 1)
 	SET(SWORD_LINK_NAME sword)
@@ -88,6 +92,9 @@ ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE)
 
 IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE)
 	ADD_LIBRARY(sword_static STATIC ${sword_SOURCES})
+    ADD_CPPCHECK(sword_static
+        POSSIBLE_ERROR TRUE
+        FORCE TRUE)
 	SET_TARGET_PROPERTIES(sword_static PROPERTIES COMPILE_FLAGS "-fPIC")
 	SET(BUILDING_STATIC 1)
 	# Defaults to linking against the shared if it is also being built
@@ -99,7 +106,7 @@ IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE)
 	# same exact name.  In other systems, the .a and .so suffixes suffice
 	# to keep them separate
 	IF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
-		SET_TARGET_PROPERTIES(sword_static PROPERTIES 
+		SET_TARGET_PROPERTIES(sword_static PROPERTIES
 			OUTPUT_NAME "sword")
 		#MESSAGE(STATUS "Building Static library with name sword")
 	ELSE(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
@@ -187,6 +194,14 @@ IF(WITH_ZLIB)
 	INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ZLIB_LIBRARY})
 ENDIF(WITH_ZLIB)
+IF(WITH_BZIP2)
+	INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${BZIP2_LIBRARY})
+ENDIF(WITH_BZIP2)
+IF(WITH_XZ)
+	INCLUDE_DIRECTORIES(${XZ_INCLUDE_DIR})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${XZ_LIBRARY})
+ENDIF(WITH_XZ)
 IF(WITH_CURL)
 	FIND_PROGRAM(CURL_CONFIG curl-config
 		DOC "The curl-config executable path, used to determine SFTP support.")
@@ -248,7 +263,7 @@ ADD_DEFINITIONS(-D_FTPLIB_NO_COMPAT)
 #############################################################################################
 # Platform-specifc bits that I will eventually refactor out into their own files, once I am happy
 # with the stuff that is here.
-# 
+#
 IF(APPLE OR iPhone)
 	ADD_DEFINITIONS(-Dunix)
 ENDIF(APPLE OR iPhone)
@@ -266,7 +281,7 @@ ENDIF(BUILDING_STATIC)
 
 ##############################################################################################
 # Installing the library, headers, utilies, etc
-# 
+#
 
 INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake")
 
@@ -280,7 +295,7 @@ ENDIF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS)
 
 ##############################################################################################
 # Utilities are hawt
-# 
+#
 
 IF(NOT SWORD_BUILD_UTILS STREQUAL "No")
 	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/utilities")
@@ -288,7 +303,7 @@ ENDIF(NOT SWORD_BUILD_UTILS STREQUAL "No")
 
 ##############################################################################################
 # Demos are also hawt
-# 
+#
 
 IF(SWORD_BUILD_EXAMPLES STREQUAL "Yes")
 	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/examples/cmdline")