experimental build

danielaparker · Oct 2, 2018 · 71f9e44 · 71f9e44
1 parent 2e8470f
commit 71f9e44
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 **/vs2015
 **/vs2013
 **/temp
+**/build
 
 test_suite/build/cmake/build_vc140x64
 test_suite/build/vs2015

diff --git a/.travis.yml b/.travis.yml
@@ -38,6 +38,20 @@ matrix:
             - g++-6
       env: COMPILER=gcc VERSION=6
 
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - clang-3.9
+            - g++-arm-linux-gnueabi
+            - g++-multilib
+            - gcc-multilib
+            - qemu
+            - qemu-system-arm
+      env: COMPILER=clang CLANG=3.9 CROSS_COMPILE=1 ARM_ARCH_DIR=arm-linux-gnueabi GCC_VER=4.7.3 ARM_SETTINGS="armv7-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
+
     - os: linux
       addons:
         apt:
@@ -95,6 +109,18 @@ matrix:
             - clang-6.0
       env: COMPILER=clang VERSION=6.0 CXXFLAGS="-DJSONCONS_NO_DEPRECATED" 
 
+    - os: osx
+      osx_image: xcode6.4
+      compiler: clang
+
+    - os: osx
+      osx_image: xcode7.3
+      compiler: clang
+
+    - os: osx
+      osx_image: xcode8
+      compiler: clang
+
     - os: osx
       osx_image: xcode8.1
       compiler: clang

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,7 +54,7 @@ install(DIRECTORY ${JSONCONS_INCLUDE_DIR}/jsoncons
 # GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
 set(JSONCONS_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE STRING "install path for jsonconsConfig.cmake")
 
-configure_package_config_file(build/cmake/config.cmake.in
+configure_package_config_file(build_files/cmake/config.cmake.in
                               "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
                               INSTALL_DESTINATION ${JSONCONS_CMAKECONFIG_INSTALL_DIR})
 

diff --git a/README.md b/README.md
@@ -572,28 +572,12 @@ Instructions for building the examples with CMake may be found in
 
 ## Supported compilers
 
-| Compiler    | Version|Architecture | Operating System | Notes |
-|-------------|--------|-------------|------------------|-------|
-| VS          | vs2015 | x86,x64     | Windows 10       |       |
-|             | vs2017 | x86,x64     | Windows 10       |       |
-| g++         | 4.8    | x64         | Ubuntu           |`std::regex` isn't fully implemented in 4.8, so `jsoncons::jsonpath` regular expression filters aren't supported |
-|             | 6      | x64         | Ubuntu           |       |
-|             | 7      | x64         | Ubuntu           |       |
-|             | 8      | x64         | Ubuntu           |       |
-| clang       | 3.8    | x64         | Ubuntu           |       |
-|             | 5.0    | x64         | Ubuntu           |       |
-|             | 6.0    | x64         | Ubuntu           |       |
-| clang xcode | 6.4    | x64         | OSX              |       |
-|             | 7.3    | x64         | OSX              |       |
-|             | 8      | x64         | OSX              |       |
-|             | 8.1    | x64         | OSX              |       |
-|             | 8.2    | x64         | OSX              |       |
-|             | 8.3    | x64         | OSX              |       |
-|             | 9      | x64         | OSX              |       |
-|             | 9.1    | x64         | OSX              |       |
-|             | 9.2    | x64         | OSX              |       |
-|             | 9.3    | x64         | OSX              |       |
-|             | 9.4    | x64         | OSX              |       |
+| Compiler                | Version          |Architecture | Operating System | Notes |
+|-------------------------|------------------|-------------|------------------|-------|
+| Microsoft Visual Studio | vs2015 and above | x86,x64     | Windows 10       |       |
+| g++                     | 4.8 and above    | x64         | Ubuntu           |`std::regex` isn't fully implemented in 4.8, so `jsoncons::jsonpath` regular expression filters aren't supported in 4.8 |
+| clang                   | 3.8 and above    | x64         | Ubuntu           |       |
+| clang xcode             | 8.1 and above    | x64         | OSX              |       |
                                                        
 ## Acknowledgements
 

diff --git a/build/cmake/Darwin.cmake → build_files/cmake/Darwin.cmake b/build/cmake/Darwin.cmake → build_files/cmake/Darwin.cmake
diff --git a/build/cmake/Linux.cmake → build_files/cmake/Linux.cmake b/build/cmake/Linux.cmake → build_files/cmake/Linux.cmake
diff --git a/build/cmake/Windows.cmake → build_files/cmake/Windows.cmake b/build/cmake/Windows.cmake → build_files/cmake/Windows.cmake
diff --git a/build/cmake/config.cmake.in → build_files/cmake/config.cmake.in b/build/cmake/config.cmake.in → build_files/cmake/config.cmake.in
diff --git a/include/jsoncons/binary/binary_utilities.hpp b/include/jsoncons/binary/binary_utilities.hpp
@@ -172,7 +172,7 @@ uint16_t encode_half(double val)
 inline 
 double decode_half(uint16_t half)
 {
-#ifdef __F16C__
+#ifdef __F16C__ && !defined(__apple_build_version__) && ((__clang_major__ < 8) || ((__clang_major__ == 8) && (__clang_minor__ < 1)))
     return _cvtsh_ss(half);
 #else
     int exp = (half >> 10) & 0x1f;

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -27,7 +27,7 @@ set(ARM_ARCH_DIRECTORY "arm-linux-gnueabi" CACHE STRING "ARM arch header dir")
 set(ARM_GCC_VER "4.7.3" CACHE STRING "ARM GCC header dir")
 
 # load per-platform configuration
-include (${JSONCONS_PROJECT_DIR}/build/cmake/${CMAKE_SYSTEM_NAME}.cmake)
+include (${JSONCONS_PROJECT_DIR}/build_files/cmake/${CMAKE_SYSTEM_NAME}.cmake)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     if (CROSS_COMPILE_ARM)