diff options
| author | Maxim Biro <nurupo.contributions@gmail.com> | 2018-10-03 07:49:17 -0400 |
|---|---|---|
| committer | Maxim Biro <nurupo.contributions@gmail.com> | 2018-10-07 15:15:58 -0400 |
| commit | f5afc526550d935585f4023142853eeb95115734 (patch) | |
| tree | 5631d20eb74e06b57b752d9619d28cd552277b4b /.travis | |
| parent | 11e1f63f54356aa6fcedea348a7be73aac81d051 (diff) | |
Default to not defining MIN_LOGGER_LEVEL in CMake
That way CMake's behavior matches what autotools does -- letting
toxcore/logger.h handle the default case.
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/cmake-freebsd-stage2 | 2 | ||||
| -rwxr-xr-x | .travis/cmake-linux | 2 | ||||
| -rwxr-xr-x | .travis/cmake-osx | 2 | ||||
| -rw-r--r-- | .travis/cmake-windows.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.travis/cmake-freebsd-stage2 b/.travis/cmake-freebsd-stage2 index 92e681f0..cf09490c 100755 --- a/.travis/cmake-freebsd-stage2 +++ b/.travis/cmake-freebsd-stage2 | |||
| @@ -56,7 +56,7 @@ travis_script() { | |||
| 56 | -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ | 56 | -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ |
| 57 | -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ | 57 | -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ |
| 58 | -DCMAKE_INSTALL_PREFIX:PATH="_install" \ | 58 | -DCMAKE_INSTALL_PREFIX:PATH="_install" \ |
| 59 | -DTRACE=ON \ | 59 | -DMIN_LOGGER_LEVEL=TRACE \ |
| 60 | -DMUST_BUILD_TOXAV=ON \ | 60 | -DMUST_BUILD_TOXAV=ON \ |
| 61 | -DSTRICT_ABI=ON \ | 61 | -DSTRICT_ABI=ON \ |
| 62 | -DTEST_TIMEOUT_SECONDS=120 \ | 62 | -DTEST_TIMEOUT_SECONDS=120 \ |
diff --git a/.travis/cmake-linux b/.travis/cmake-linux index 541eb014..87df3b37 100755 --- a/.travis/cmake-linux +++ b/.travis/cmake-linux | |||
| @@ -91,7 +91,7 @@ travis_script() { | |||
| 91 | -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ | 91 | -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ |
| 92 | -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ | 92 | -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ |
| 93 | -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \ | 93 | -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \ |
| 94 | -DTRACE=ON \ | 94 | -DMIN_LOGGER_LEVEL=TRACE \ |
| 95 | -DMUST_BUILD_TOXAV=ON \ | 95 | -DMUST_BUILD_TOXAV=ON \ |
| 96 | -DSTRICT_ABI=ON \ | 96 | -DSTRICT_ABI=ON \ |
| 97 | -DTEST_TIMEOUT_SECONDS=120 \ | 97 | -DTEST_TIMEOUT_SECONDS=120 \ |
diff --git a/.travis/cmake-osx b/.travis/cmake-osx index 524f7116..9c5b8e10 100755 --- a/.travis/cmake-osx +++ b/.travis/cmake-osx | |||
| @@ -28,7 +28,7 @@ travis_script() { | |||
| 28 | -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ | 28 | -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ |
| 29 | -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ | 29 | -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ |
| 30 | -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \ | 30 | -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \ |
| 31 | -DTRACE=ON \ | 31 | -DMIN_LOGGER_LEVEL=TRACE \ |
| 32 | -DMUST_BUILD_TOXAV=ON \ | 32 | -DMUST_BUILD_TOXAV=ON \ |
| 33 | -DTEST_TIMEOUT_SECONDS=120 \ | 33 | -DTEST_TIMEOUT_SECONDS=120 \ |
| 34 | -DUSE_IPV6=OFF | 34 | -DUSE_IPV6=OFF |
diff --git a/.travis/cmake-windows.sh b/.travis/cmake-windows.sh index a7d1f7e1..80e37141 100644 --- a/.travis/cmake-windows.sh +++ b/.travis/cmake-windows.sh | |||
| @@ -30,7 +30,7 @@ travis_script() { | |||
| 30 | -e ENABLE_ARCH_i686=$i686 \ | 30 | -e ENABLE_ARCH_i686=$i686 \ |
| 31 | -e ENABLE_ARCH_x86_64=$x86_64 \ | 31 | -e ENABLE_ARCH_x86_64=$x86_64 \ |
| 32 | -e ENABLE_TEST=true \ | 32 | -e ENABLE_TEST=true \ |
| 33 | -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DDEBUG=ON -DTEST_TIMEOUT_SECONDS=90" \ | 33 | -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90" \ |
| 34 | -e DCMAKE_C_FLAGS="$C_FLAGS" \ | 34 | -e DCMAKE_C_FLAGS="$C_FLAGS" \ |
| 35 | -e CMAKE_CXX_FLAGS="$CXX_FLAGS" \ | 35 | -e CMAKE_CXX_FLAGS="$CXX_FLAGS" \ |
| 36 | -e CMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ | 36 | -e CMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ |