diff --git a/.appveyor.yml b/.appveyor.yml index 24db30db..02889d18 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,7 +15,7 @@ init: [] install: [] before_build: - git submodule update --init --recursive -- cmake -H. -Bbuild -G"Visual Studio 14 2015 Win64" -DSHARED=%SHARED% -DSTATIC=%STATIC% -DTESTS=ON +- cmake -H. -Bbuild -G"Visual Studio 14 2015 Win64" -DSHARED=%SHARED% -DSTATIC=%STATIC% -DWITH_TESTS=ON build: project: build\xlnt.sln diff --git a/.travis.yml b/.travis.yml index e48ac90a..e291609d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ script: - cmake --version - mkdir build - cd build - - cmake -D SHARED=1 -D STATIC=0 -D TESTS=1 -D CMAKE_CXX_COMPILER=$COMPILER .. + - cmake -D SHARED=1 -D STATIC=0 -D WITH_TESTS=1 -D CMAKE_CXX_COMPILER=$COMPILER .. - cmake --build . --target xlnt.test - bin/xlnt.test @@ -49,7 +49,7 @@ after_success: - if [ "$COMPILER" = "g++-4.9" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90 ; fi - if [ "$COMPILER" = "g++-4.9" ]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.9 90 ; fi - if [ "$COMPILER" = "g++-4.9" ]; then rm -rf ./* ; fi - - if [ "$COMPILER" = "g++-4.9" ]; then cmake -G "Unix Makefiles" -D DEBUG=1 -D COVERAGE=1 -D SHARED=0 -D STATIC=1 -D TESTS=1 .. ; fi + - if [ "$COMPILER" = "g++-4.9" ]; then cmake -G "Unix Makefiles" -D DEBUG=1 -D COVERAGE=1 -D SHARED=0 -D STATIC=1 -D WITH_TESTS=1 .. ; fi - if [ "$COMPILER" = "g++-4.9" ]; then make VERBOSE=1 ; fi - if [ "$COMPILER" = "g++-4.9" ]; then cd .. && ./build/bin/xlnt.test ; fi - if [ "$COMPILER" = "g++-4.9" ]; then export OLDWD=$(pwd) ; fi