From 6f69134168e54326297054d7bd7005f0273521d4 2017-06-07 15:27:26 From: mperrinel Date: 2017-06-07 15:27:26 Subject: [PATCH] Remove coverage from windows build Correction for Linux compilation --- diff --git a/app/src/main.cpp b/app/src/Main.cpp similarity index 97% rename from app/src/main.cpp rename to app/src/Main.cpp index 0812bf2..cb3a380 100644 --- a/app/src/main.cpp +++ b/app/src/Main.cpp @@ -19,7 +19,7 @@ /*-- Author : Alexis Jeandet -- Mail : alexis.jeandet@member.fsf.org ----------------------------------------------------------------------------*/ -#include "mainwindow.h" +#include "MainWindow.h" #include #include #include diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index b764e17..0263499 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -97,8 +97,10 @@ IF(BUILD_TESTS) SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES}) set(Coverage_NAME ${testName}) - SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName}) - LIST( APPEND TARGETS_COV ${testName}_coverage) + if(UNIX) + SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName}) + LIST( APPEND TARGETS_COV ${testName}_coverage) + endif(UNIX) ENDFOREACH( testFile ) diff --git a/core/include/Common/spimpl.h b/core/include/Common/spimpl.h index 7f6e8be..b4d5e04 100644 --- a/core/include/Common/spimpl.h +++ b/core/include/Common/spimpl.h @@ -89,9 +89,8 @@ using default_copier_t = typename default_copier::type; template struct is_default_manageable - : public std::integral_constant >::value - && std::is_same >::value> { + : public std::integral_constant >::value + && std::is_same >::value> { }; } @@ -132,11 +131,10 @@ public: } template - impl_ptr(U *u, - typename std::enable_if::value - && is_default_manageable::value, - dummy_t_>::type - = dummy_t_()) SPIMPL_NOEXCEPT + impl_ptr(U *u, typename std::enable_if::value + && is_default_manageable::value, + dummy_t_>::type + = dummy_t_()) SPIMPL_NOEXCEPT : impl_ptr(u, &details::default_delete, &details::default_copy) { } @@ -153,12 +151,12 @@ public: #ifdef SPIMPL_HAS_AUTO_PTR template - impl_ptr(std::auto_ptr &&u, - typename std::enable_if::value - && is_default_manageable::value, - dummy_t_>::type - = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(u.release(), &details::default_delete), - copier_(&details::default_copy) + impl_ptr(std::auto_ptr &&u, typename std::enable_if::value + && is_default_manageable::value, + dummy_t_>::type + = dummy_t_()) SPIMPL_NOEXCEPT + : ptr_(u.release(), &details::default_delete), + copier_(&details::default_copy) { } #endif diff --git a/core/src/DataSource/DataSourceController.cpp b/core/src/DataSource/DataSourceController.cpp index 0149694..f3def90 100644 --- a/core/src/DataSource/DataSourceController.cpp +++ b/core/src/DataSource/DataSourceController.cpp @@ -21,14 +21,14 @@ public: DataSourceController::DataSourceController(QObject *parent) : impl{spimpl::make_unique_impl()} { - qCDebug(LOG_DataSourceController()) - << tr("DataSourceController construction") << QThread::currentThread(); + qCDebug(LOG_DataSourceController()) << tr("DataSourceController construction") + << QThread::currentThread(); } DataSourceController::~DataSourceController() { - qCDebug(LOG_DataSourceController()) - << tr("DataSourceController destruction") << QThread::currentThread(); + qCDebug(LOG_DataSourceController()) << tr("DataSourceController destruction") + << QThread::currentThread(); this->waitForFinish(); } @@ -61,8 +61,8 @@ void DataSourceController::setDataSourceItem( void DataSourceController::initialize() { - qCDebug(LOG_DataSourceController()) - << tr("DataSourceController init") << QThread::currentThread(); + qCDebug(LOG_DataSourceController()) << tr("DataSourceController init") + << QThread::currentThread(); impl->m_WorkingMutex.lock(); qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END"); } diff --git a/core/src/Visualization/VisualizationController.cpp b/core/src/Visualization/VisualizationController.cpp index d4c246f..d87cbee 100644 --- a/core/src/Visualization/VisualizationController.cpp +++ b/core/src/Visualization/VisualizationController.cpp @@ -16,21 +16,21 @@ public: VisualizationController::VisualizationController(QObject *parent) : impl{spimpl::make_unique_impl()} { - qCDebug(LOG_VisualizationController()) - << tr("VisualizationController construction") << QThread::currentThread(); + qCDebug(LOG_VisualizationController()) << tr("VisualizationController construction") + << QThread::currentThread(); } VisualizationController::~VisualizationController() { - qCDebug(LOG_VisualizationController()) - << tr("VisualizationController destruction") << QThread::currentThread(); + qCDebug(LOG_VisualizationController()) << tr("VisualizationController destruction") + << QThread::currentThread(); this->waitForFinish(); } void VisualizationController::initialize() { - qCDebug(LOG_VisualizationController()) - << tr("VisualizationController init") << QThread::currentThread(); + qCDebug(LOG_VisualizationController()) << tr("VisualizationController init") + << QThread::currentThread(); impl->m_WorkingMutex.lock(); qCDebug(LOG_VisualizationController()) << tr("VisualizationController init END"); }