From 15f935b97885528c27adfae7e69069559e00bfb4 Mon Sep 17 00:00:00 2001 From: Lorenzo Pivetta <5919598+lorenzopivetta@users.noreply.github.com> Date: Fri, 24 Jan 2020 11:14:48 +0100 Subject: [PATCH 1/2] Add switch to disable building tests --- CMakeLists.txt | 4 ++-- configure/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9da9adaa..e9321f486 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,9 +32,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/log4tango/include) #source code add_subdirectory("log4tango") add_subdirectory("cppapi") -if(NOT WIN32) +if(TANGO_COMPILE_TEST_SUITE) add_subdirectory("cpp_test_suite") -endif(NOT WIN32) +endif() if(WIN32) include(configure/cmake_win.cmake) diff --git a/configure/CMakeLists.txt b/configure/CMakeLists.txt index e0d18099a..06d119085 100644 --- a/configure/CMakeLists.txt +++ b/configure/CMakeLists.txt @@ -212,3 +212,5 @@ if(NOT WIN32) endif() include(GNUInstallDirs) include(configure/coveralls.cmake) + +option(TANGO_COMPILE_TEST_SUITE "Compile the test suite" ON) From b115acac7a31dc9aad774f5f6944e30838b2598c Mon Sep 17 00:00:00 2001 From: Lorenzo Pivetta <5919598+lorenzopivetta@users.noreply.github.com> Date: Fri, 24 Jan 2020 12:31:34 +0100 Subject: [PATCH 2/2] Update cmd with -DTANGO_COMPILE_TEST_SUITE=OFF --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ed73b2f2d..341733d2c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -255,10 +255,10 @@ install: - cmd: set PTHREAD_WIN=C:/projects/pthreads-win32/ #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE . #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE . - - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% . + - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DTANGO_COMPILE_TEST_SUITE=OFF . - cmd: cd c:/projects/debug_build #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Debug . - - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DCMAKE_BUILD_TYPE=Debug -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% . + - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DCMAKE_BUILD_TYPE=Debug -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DTANGO_COMPILE_TEST_SUITE=OFF . clone_folder: C:\projects\cppTango