Merge pull request LLNL#69 from LLNL/feature/zagaris2/git-macros

feature/zagaris2/git-macros

.travis.yml

@@ -106,12 +106,23 @@ install:
   - sh cmake-${CMAKE_MAJOR}.${CMAKE_MINOR}-Linux-x86_64.sh --skip-license --prefix=${TRAVIS_TPLS_DIR}/cmake/
   - export PATH=${TRAVIS_TPLS_DIR}/cmake/bin:$PATH
 script:
+  # set git user info     
+  - git config --global user.email "[email protected]" 
+  - git config --global user.name  "BLT Robot"    
   - cmake --version
   - cd $TRAVIS_BUILD_DIR/..
   # copy our internal testing project
   - cp -r blt/cmake/blt-test .
   # symlink blt into this project
   - ln -s ${TRAVIS_BUILD_DIR} blt-test/blt
+  # create a git repo for blt-test to test the git macros
+  - cd blt-test
+  - git init
+  - git add -A
+  - git commit -a -m "Initial Commit"
+  - git checkout -b test-branch
+  - git tag test-tag  
+  - cd ..  
   # create an out-of-source build dir and an install dir
   - mkdir travis-debug-build
   - mkdir travis-debug-install

SetupBLT.cmake

@@ -86,6 +86,13 @@ if (NOT BLT_LOADED)
   ################################
   include(${BLT_ROOT_DIR}/cmake/thirdparty/SetupThirdParty.cmake)
 
+  ################################
+  # Git related Macros
+  ################################
+  if (Git_FOUND)
+    include(${BLT_ROOT_DIR}/cmake/BLTGitMacros.cmake)
+  endif()
+
   ################################
   # Setup docs targets
   ################################

appveyor.yml

@@ -14,6 +14,9 @@ environment:
 init:
   # line endings magic
   - git config --global core.autocrlf input
+  # set git user info 
+  - git config --global user.email "[email protected]"
+  - git config --global user.name "BLT Robot"  
 
 before_build:
   # remove some noisy warnings from Xamarin
@@ -22,6 +25,14 @@ before_build:
   - ps: cd ..
   - cp -r blt\cmake\blt-test .
   - cp -r blt blt-test
+  # create a git repo for blt-test to test the git macros
+  - cd blt-test
+  - git init
+  - git add -A
+  - git commit -a -m "Initial Commit"
+  - git checkout -b test-branch
+  - git tag test-tag  
+  - cd ..  
   # configure
   - echo Running cmake ...
   - cmake -Hblt-test -Bbuild -G "%CMAKE_GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DENABLE_GMOCK=%ENABLE_GMOCK% -DENABLE_BENCHMARKS=%ENABLE_BENCHMARKS% -DENABLE_OPENMP=ON