Merge remote-tracking branch 'upstream/master' into carpmeshIO

Author: Karli Gillette

.travis.yml

@@ -10,18 +10,14 @@ matrix:
       dist: trusty
       sudo: required
       compiler: clang
-#   - os: osx
-#     osx_image: xcode7.2
+#    - os: osx
+#      osx_image: xcode7.2
 
-# check environment (copied from libgit2sharp)
 before_install:
 - date -u
 - uname -a
-#- sudo apt-get update -qq
+- sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa
 
-# TODO: could move script to separate file
-# Not running unit tests at the moment, so turn off testing, which will
-# hopefully make OS X builds a bit faster
 script:
   - cd bin
   - cmake -DTRAVIS_BUILD:BOOL=ON ../Superbuild

src/CMakeLists.txt

@@ -108,6 +108,7 @@ get_git_head_revision(VERSION_REFSPEC VERSION_HASHVAR)
 
 IF(VERSION_TAG MATCHES "HEAD-HASH-NOTFOUND")
   FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/LATEST_TAG.txt VERSION_TAG)
+  STRING(STRIP ${VERSION_TAG} VERSION_TAG)
   MESSAGE(STATUS "Found tag file for version info: " "${VERSION_TAG}")
 ENDIF()