diff --git a/.travis.yml b/.travis.yml index 2991694..02fb059 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,9 @@ matrix: # Linux GCC-4.6 debug static coveralls - compiler: gcc env: TRAVIS_BUILD_TYPE=Debug TRAVIS_COVERALLS=ON + # Linux GCC-4.6 debug static google_double-conversion + - compiler: gcc + env: TRAVIS_BUILD_TYPE=Debug TRAVIS_FLOAT2STR_LIB=google_doubleconversion # Linux GCC-4.6 debug dll c90 - compiler: gcc env: TRAVIS_BUILD_TYPE=Debug TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON @@ -27,6 +30,10 @@ matrix: - os: osx compiler: clang env: TRAVIS_BUILD_TYPE=Debug + # OSX Clang debug static google_double-conversion + - os: osx + compiler: clang + env: TRAVIS_BUILD_TYPE=Debug TRAVIS_FLOAT2STR_LIB=google_doubleconversion # OSX Clang debug dll c90 - os: osx compiler: clang diff --git a/appveyor.yml b/appveyor.yml index b22f2ed..997f82b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,9 +16,11 @@ environment: matrix: - APPVEYOR_SHARED_LIBS: OFF APPVEYOR_CMAKE_GENERATOR: "Visual Studio 12 2013" + APPVEYOR_FLOAT2STR_LIB: std - APPVEYOR_SHARED_LIBS: ON APPVEYOR_CMAKE_GENERATOR: "Visual Studio 12 2013" + APPVEYOR_FLOAT2STR_LIB: google_doubleconversion build: @@ -31,6 +33,7 @@ build_script: -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^ -DCMAKE_DEBUG_POSTFIX=_d ^ -DGMIO_BUILD_SHARED_LIBS=%APPVEYOR_SHARED_LIBS% ^ + -DGMIO_FLOAT2STR_LIB=%APPVEYOR_FLOAT2STR_LIB% ^ -DGMIO_BUILD_EXAMPLES=ON ^ -DGMIO_BUILD_BENCHMARKS=ON ^ -DGMIO_BUILD_BENCHMARK_ASSIMP=OFF ^ diff --git a/travis-build-script.sh b/travis-build-script.sh index a1f945e..22cd0db 100644 --- a/travis-build-script.sh +++ b/travis-build-script.sh @@ -29,6 +29,10 @@ if [ -z "${TRAVIS_STRICT_C90}" ]; then export TRAVIS_STRICT_C90=OFF; fi +if [ -z "${TRAVIS_FLOAT2STR_LIB}" ]; then + export TRAVIS_FLOAT2STR_LIB=std; +fi + # Run CMake mkdir build && cd build cmake --version @@ -44,7 +48,8 @@ cmake .. -G "Unix Makefiles" \ -DGMIO_BUILD_BENCHMARK_ASSIMP=OFF \ -DGMIO_BUILD_BENCHMARK_OPENCASCADE=OFF \ -DGMIO_BUILD_TESTS_FAKE_SUPPORT=ON \ - -DGMIO_BUILD_TESTS_COVERAGE=$TRAVIS_COVERALLS + -DGMIO_BUILD_TESTS_COVERAGE=$TRAVIS_COVERALLS \ + -DGMIO_FLOAT2STR_LIB=$TRAVIS_FLOAT2STR_LIB # Make make -j4