Fix TravisCI build issues

Fixes #5 and #6

Author: mdimura

.travis.yml

@@ -26,5 +26,5 @@ install:
 #- conda config --add channels conda-forge # hightest priority
 script:
   - mkdir build && cd build
-  - cmake ..
+  - cmake -DPYTHON_WORKAROUND=ON ..
   - make .

CMakeLists.txt

@@ -1,4 +1,18 @@
 cmake_minimum_required(VERSION 3.0.2)
+
+option(PYTHON_WORKAROUND "Workaround for environments with multiple python versions" OFF)
+
+# Problem building in Travis-CI tried fix:
+# https://github.com/pybind/pybind11/issues/236
+# This is really a bad fix, as the Python headers
+# won't be found in most build environments.
+# See also: https://github.com/Fluorescence-Tools/LabelLib/issues/5
+if(PYTHON_WORKAROUND)
+  set(PYTHONLIBS_FOUND TRUE)
+  set(PYTHON_MODULE_EXTENSION .so)
+  set(PYTHON_MODULE_PREFIX "")
+endif(PYTHON_WORKAROUND)
+
 set(CMAKE_CXX_STANDARD 11)
 if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11")
@@ -20,11 +34,6 @@ set(GIT_VERSION_STRING "version-unknown")
 if(GIT_FOUND)
     include(GitDateVersion)
     gitDateVersionString(GIT_VERSION_STRING)
-    # Split the version string by the hyphens, e.g., 2018.12.03-(HEAD detached at 4f65afa)-4f65afa,
-    # and take the first element as a version name
-    string(REPLACE "-" ";" GIT_VERSION_LIST ${GIT_VERSION_STRING})
-    message(STATUS "${GIT_VERSION_LIST}")
-    list(GET GIT_VERSION_LIST 0 GIT_VERSION_STRING)
     message(STATUS "GIT version: ${GIT_VERSION_STRING}")
 endif()
 add_definitions("-DGIT_VERSION_STRING=\"${GIT_VERSION_STRING}\"")

FlexLabel/CMakeLists.txt

@@ -17,13 +17,6 @@ if (NOT TARGET Eigen3::Eigen)
 endif (NOT TARGET Eigen3::Eigen)
 include_directories(${EIGEN3_INCLUDE_DIR})
 
-# Problem building in Travis-CI tried fix:
-# https://github.com/pybind/pybind11/issues/236
-# This is really a bad fix, as the Python headers 
-# won't be found in most build environments.
-set(PYTHONLIBS_FOUND TRUE) 
-set(PYTHON_MODULE_EXTENSION .so)
-set(PYTHON_MODULE_PREFIX "")
 find_package(pybind11 2.2 QUIET)
 if(NOT pybind11_FOUND)
     message(STATUS "Using thirdparty/pybind11")

cmake/GitDateVersion.cmake

@@ -19,7 +19,7 @@ function (gitDateVersionString _verStr)
   endif()
 
   execute_process(
-    COMMAND "${GIT_EXECUTABLE}" branch --contains ${hash}
+    COMMAND "${GIT_EXECUTABLE}" branch --contains ${hash} "--format=%(refname:short)" --sort=-committerdate
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     RESULT_VARIABLE res
     OUTPUT_VARIABLE branch
@@ -28,7 +28,6 @@ function (gitDateVersionString _verStr)
   if(NOT res EQUAL 0)
     set(branch "nobranch")
   endif()
-  STRING(REPLACE "* " "" branch ${branch})
   STRING(REGEX REPLACE "\n.*" "" branch ${branch})
 
   execute_process(

setup.py

@@ -58,12 +58,16 @@ def build_extension(self, ext):
 
 
 def gitVersionString():
+  hard_version="2018.12.11"
   try:
     out = subprocess.check_output(['git', 'show', '-s', '--format=%cd', '--date=short'])
-    out = out.decode().replace('-','.')
+    out = out.decode().replace('-','.').strip()
+    if out != hard_version:
+        print("WARNING: git-based version ({}) "
+              "does not match the default version ({})!".format(out,hard_version))
     return out
   except:
-    return "unknown-version"
+    return hard_version
 
 
 setup(