travis experimental build

danielaparker · Oct 1, 2018 · 2659edb · 2659edb
1 parent e70c258
commit 2659edb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -96,7 +96,7 @@ matrix:
       env: COMPILER=clang VERSION=6.0 CXXFLAGS="-DJSONCONS_NO_DEPRECATED" 
 
     - os: osx
-      osx_image: xcode8
+      osx_image: xcode8.1
       compiler: clang
 
 before_install:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,9 +22,8 @@ message(STATUS "jsoncons v${${PROJECT_NAME}_VERSION}")
 # Build
 # =====
 
-set(JSONCONS_HEADERS
-    ${JSONCONS_INCLUDE_DIR}/jsoncons/json.hpp
-)
+
+file(GLOB_RECURSE JSONCONS_HEADERS ${JSONCONS_INCLUDE_DIR}/*.hpp)
 
 add_library(jsoncons INTERFACE)
 target_include_directories(jsoncons INTERFACE $<BUILD_INTERFACE:${JSONCONS_INCLUDE_DIR}>

diff --git a/include/jsoncons/version.hpp b/include/jsoncons/version.hpp
@@ -9,9 +9,9 @@
 
 #include <iostream>
 
-#define XSIMD_VERSION_MAJOR 0
-#define XSIMD_VERSION_MINOR 109
-#define XSIMD_VERSION_PATCH 0
+#define JSONCONS_VERSION_MAJOR 0
+#define JSONCONS_VERSION_MINOR 110
+#define JSONCONS_VERSION_PATCH 1
 
 namespace jsoncons {
 
@@ -45,7 +45,7 @@ struct versioning_info
 inline
 versioning_info version()
 {
-    static versioning_info ver(0, 110, 1);
+    static versioning_info ver(JSONCONS_VERSION_MAJOR, JSONCONS_VERSION_MINOR, JSONCONS_VERSION_PATCH);
     return ver;
 }
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -66,11 +66,6 @@ target_include_directories (Catch INTERFACE ${CATCH_INCLUDE_DIR})
 
 file(GLOB_RECURSE JSONCONS_TESTS_SOURCES ${JSONCONS_TESTS_SOURCE_DIR}/*.cpp)
 
-# set(JSONCONS_TESTS_SOURCES
-#    src/tests_main.cpp
-#    src/json_stream_reader_tests.cpp
-# )
-
 set(JSONCONS_TARGET test_jsoncons)
 add_executable(${JSONCONS_TARGET} EXCLUDE_FROM_ALL ${JSONCONS_TESTS_SOURCES} ${JSONCONS_HEADERS})
 target_include_directories (${JSONCONS_TARGET} PUBLIC ${JSONCONS_INCLUDE_DIR}