[med-svn] [libqes] 01/03: New upstream version 0.2.7

[Kevin Murray]

This is an automated email from the git hooks/post-receive script.

daube-guest pushed a commit to branch master
in repository libqes.

commit 55a31545b74799fa9ba4a22e27a8db34c09cec8e
Author: Kevin Murray <kdmfoss at gmail.com>
Date:   Thu Dec 1 12:18:59 2016 +1100

    New upstream version 0.2.7
---
 CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++++--------------------
 src/qes_file.c |  4 ++--
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fb3d6c..6f8c049 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,31 +1,54 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(libqes C)
 
+if (NOT DEFINED LIBQES_IS_SUBPROJECT)
+  if ("^${CMAKE_SOURCE_DIR}$" STREQUAL "^${PROJECT_SOURCE_DIR}$")
+    set (LIBQES_IS_SUBPROJECT FALSE)
+  else ()
+    set (LIBQES_IS_SUBPROJECT TRUE)
+    message(STATUS "Detected that LIBQES is used a subproject.")
+  endif ()
+endif ()
+
+
 # Append cmake-modules to module path
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules")
+    "${PROJECT_SOURCE_DIR}/cmake-modules")
+
+
+IF (NOT CMAKE_BUILD_TYPE)
+    SET(CMAKE_BUILD_TYPE Release)
+ENDIF()
 
 
-IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/version")
-	FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/version" LIBQES_VERSION)
+IF (NOT LIBQES_IS_SUBPROJECT)
+    IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/version")
+        FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/version" LIBQES_VERSION)
+    ELSE()
+        # git describe as versioning
+        EXECUTE_PROCESS(COMMAND git describe
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                OUTPUT_VARIABLE LIBQES_VERSION
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+    ENDIF()
+    MESSAGE(STATUS "${CMAKE_BUILD_TYPE} build of ${PROJECT_NAME} version: ${LIBQES_VERSION}")
 ELSE()
-	# git describe as versioning
-	EXECUTE_PROCESS(COMMAND git describe
-			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-			OUTPUT_VARIABLE LIBQES_VERSION
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
+    SET(LIBQES_VERSION "")
 ENDIF()
 
+
 #############################
 ## Setup CMAKE Environment ##
 #############################
 
 # Set this before you include libqes as a CMake subproject, so that we know not
 # to add cmake to the install rule
-IF (LIBQES_AS_SUBMODULE)
-    SET(LIBQES_DONT_INSTALL True)
-ELSE()
-    SET(LIBQES_DONT_INSTALL False)
+IF (LIBQES_IS_SUBPROJECT)
+    IF(NOT DEFINED LIBQES_DONT_INSTALL)
+        SET(LIBQES_DONT_INSTALL True)
+    ELSE()
+        SET(LIBQES_DONT_INSTALL False)
+    ENDIF()
 ENDIF()
 
 OPTION(NO_OPENMP "Disable OpenMP" False)
@@ -37,12 +60,6 @@ IF (DEV)
     SET(CMAKE_BUILD_TYPE Coverage)
 ENDIF()
 
-IF (NOT CMAKE_BUILD_TYPE)
-    SET(CMAKE_BUILD_TYPE Release)
-ENDIF()
-
-MESSAGE(STATUS "${CMAKE_BUILD_TYPE} build of ${PROJECT_NAME} version: ${LIBQES_VERSION}")
-
 # Set output directories
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -66,7 +83,7 @@ INCLUDE(CPack)
 ##########################
 
 
-SET(WARN_FLAGS "${WARN_FLAGS} -Wall -Wextra -Wpedantic")
+SET(WARN_FLAGS "${WARN_FLAGS} -Wall -Wextra -pedantic")
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE ${WARN_FLAGS}")
 
@@ -142,6 +159,6 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lib)
 
 # Traverse to library source and tests
 ADD_SUBDIRECTORY(src)
-if (NOT LIBQES_AS_SUBMODULE)
+if (NOT LIBQES_IS_SUBPROJECT)
     ADD_SUBDIRECTORY(test)
 endif()
diff --git a/src/qes_file.c b/src/qes_file.c
index 93fee0f..bda2809 100644
--- a/src/qes_file.c
+++ b/src/qes_file.c
@@ -99,7 +99,7 @@ qes_file_open_ (const char *path, const char *mode, qes_errhandler_func onerr,
     if (qf->buffer == NULL) {
         QES_ZCLOSE(qf->fp);
         qes_free(qf);
-        (*onerr)("Coudn't allocate buffer memory", file, line);
+        (*onerr)("Couldn't allocate buffer memory", file, line);
         return NULL;
     }
     qf->bufiter = qf->buffer;
@@ -328,7 +328,7 @@ qes_file_getuntil_realloc_(struct qes_file *file, int delim, char **bufref,
         /* file->buffer should now be empty, so fill 'er up! */
         ret = __qes_file_fill_buffer(file);
         if (ret == 0) {
-            /* Couln't fill, error out */
+            /* Couldn't fill, error out */
             return -2;
         } else if (ret == EOF) {
             /* EOF time */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libqes.git