From 807549c77d477a28f0c4e26b107a52db6e86f64f Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 6 Sep 2018 13:04:58 +0100
Subject: [PATCH] Squashed 'cmake/cable/' changes from 6458a65..311c059

311c059 Cable 0.2.13: Fix spelling typos
d4de521 Cable 0.2.12
646c412 gitinfo: Use --first-parent for git-describe

git-subtree-dir: cmake/cable
git-subtree-split: 311c0599183fbc46b402f40d6e6e5033ace2f686
---
 CableCompilerSettings.cmake | 2 +-
 bootstrap.cmake             | 8 ++++----
 buildinfo/gitinfo.cmake     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CableCompilerSettings.cmake b/CableCompilerSettings.cmake
index 35dcd93..d3ea268 100644
--- a/CableCompilerSettings.cmake
+++ b/CableCompilerSettings.cmake
@@ -35,7 +35,7 @@ macro(cable_configure_compiler)
         cmake_parse_arguments(cable "NO_CONVERSION_WARNINGS;NO_STACK_PROTECTION" "" "" ${ARGN})
 
         if(cable_UNPARSED_ARGUMENTS)
-            message(FATAL_ERROR "cable_configure_compiler: Uknown options: ${cable_UNPARSED_ARGUMENTS}")
+            message(FATAL_ERROR "cable_configure_compiler: Unknown options: ${cable_UNPARSED_ARGUMENTS}")
         endif()
 
         # Set helper variables recognizing C++ compilers.
diff --git a/bootstrap.cmake b/bootstrap.cmake
index 9b01956..4acf67e 100644
--- a/bootstrap.cmake
+++ b/bootstrap.cmake
@@ -8,11 +8,11 @@
 
 # Cable version.
 #
-# This is internal variable automaticaly updated with external tools.
+# This is internal variable automatically updated with external tools.
 # Use CABLE_VERSION variable if you need this information.
-set(version 0.2.11)
+set(version 0.2.13)
 
-# For conveniance, add the project CMake module dir to module path.
+# For convenience, add the project CMake module dir to module path.
 set(module_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 if(EXISTS ${module_dir})
     list(APPEND CMAKE_MODULE_PATH ${module_dir})
@@ -24,7 +24,7 @@ if(CABLE_VERSION)
     # Compare versions of the top project and this instances.
     if(CABLE_VERSION VERSION_LESS version)
         set(severity WARNING)
-        set(comment "vesion older than ${version}")
+        set(comment "version older than ${version}")
     elseif(CABLE_VERSION VERSION_EQUAL version)
         set(severity STATUS)
         set(comment "same version")
diff --git a/buildinfo/gitinfo.cmake b/buildinfo/gitinfo.cmake
index 53068da..0d7bc2f 100644
--- a/buildinfo/gitinfo.cmake
+++ b/buildinfo/gitinfo.cmake
@@ -5,7 +5,7 @@
 # Execute git only if the tool is available.
 if(GIT)
     execute_process(
-        COMMAND ${GIT} describe --always --long --tags --match=v* --abbrev=40 --dirty
+        COMMAND ${GIT} describe --always --long --tags --first-parent --match=v* --abbrev=40 --dirty
         WORKING_DIRECTORY ${SOURCE_DIR}
         OUTPUT_VARIABLE gitinfo
         OUTPUT_STRIP_TRAILING_WHITESPACE