Follow cnl (hbe72#11)

Update to latest CNL develop version and simplify Travis build
johnmcfarlane · Oct 3, 2019 · b93e2fe · b93e2fe
1 parent c259278
commit b93e2fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -76,12 +76,9 @@ matrix:
 
     #OSX C++17
     - os: osx
-      osx_image: xcode8
-      env: MATRIX_EVAL="brew update && brew install gcc@6 && CC=gcc-6 && CXX=g++-6" BUILD_TYPE=Release STD=17 EXCEPTIONS=OFF INT128=ON
-
-    - os: osx
-      osx_image: xcode8
-      env: MATRIX_EVAL="brew update && brew install gcc@6 && CC=gcc-6 && CXX=g++-6" BUILD_TYPE=Release STD=17 EXCEPTIONS=OFF INT128=OFF
+      osx_image: xcode9.3
+      compiler: clang #Apple LLVM version 9.1.0
+      env: MATRIX_EVAL="" BUILD_TYPE=Release STD=17 EXCEPTIONS=OFF INT128=ON
 
 before_install:
   - eval "${MATRIX_EVAL}"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ message("-- INT128 = ${INT128}")
 message("-- STD = ${STD}")
 message("-- EXCEPTIONS = ${EXCEPTIONS}")
 
-set(CNL_GIT_TAG_DEFAULT 6cd6ad26786f767dd75ca7111a98ba83f0e39dff)
+set(CNL_GIT_TAG_DEFAULT 0d2f1ee6dbc28c3f55ebcaa51bde7caa90fcc895)
 set(CNL_GIT_TAG_ENV $ENV{CDSP_CNL_GIT_TAG})
 set(CNL_GIT_TAG "" CACHE BOOL "specify which revision of CNL to use")