From bbb3a36891b9aead1d9dcde8e2062eeb1f0867fe 2017-05-29 16:18:38
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-05-29 16:18:38
Subject: [PATCH] Ajout du logger compatible Linux à la compilation.

---

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 959e34c..e160ed8 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -16,7 +16,6 @@ SCIQLOP_FIND_QT(Core Widgets)
 # ========================
 find_package(sciqlop-gui)
 
-message("Librairies inclues dans APP: ${SCIQLOP-GUI_LIBRARIES}")
 SET(LIBRARIES ${SCIQLOP-GUI_LIBRARIES})
 SET(EXTERN_SHARED_LIBRARIES)
 
diff --git a/cmake/sciqlop_applications.cmake b/cmake/sciqlop_applications.cmake
index 877c2d4..9b41ac3 100644
--- a/cmake/sciqlop_applications.cmake
+++ b/cmake/sciqlop_applications.cmake
@@ -5,7 +5,13 @@
 #
 SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
 SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
-
+IF (UNIX)
+    SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
+ELSEIF(WIN32)
+    SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}/app/QtProject)
+ELSE()
+    SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
+ENDIF()
 
 #
 # Compile the diffents modules
@@ -20,6 +26,11 @@ ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/gui")
 
 ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")
 
+# LOGGER
+set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini")
+FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH})
+
+
 #
 # Code formatting
 #
diff --git a/cmake/sciqlop_formatting.cmake b/cmake/sciqlop_formatting.cmake
index 539f2a8..98fa28e 100644
--- a/cmake/sciqlop_formatting.cmake
+++ b/cmake/sciqlop_formatting.cmake
@@ -34,8 +34,6 @@ IF (ENABLE_CHECKSTYLE)
             LIST(APPEND EXCLUSIONS EXCLUSION ${e})
         ENDFOREACH()
 
-        message("Exclusions de vera++: ${EXCLUSIONS}")
-
         ADD_VERA_TARGETS(${CHECKSTYLE_INPUT_FILES}
             ADD_TO_ALL
             PROFILE "sciqlop"
diff --git a/config/QtProject/qtlogging.ini b/config/QtProject/qtlogging.ini
new file mode 100755
index 0000000..3f38f60
--- /dev/null
+++ b/config/QtProject/qtlogging.ini
@@ -0,0 +1,4 @@
+[Rules]
+*.debug=false
+SqpApplication.debug=true
+DataSourceController.debug=true
diff --git a/core/src/DataSource/DataSourceController.cpp b/core/src/DataSource/DataSourceController.cpp
index ed71deb..40ac74d 100644
--- a/core/src/DataSource/DataSourceController.cpp
+++ b/core/src/DataSource/DataSourceController.cpp
@@ -3,7 +3,10 @@
 #include <QMutex>
 #include <QThread>
 
-Q_LOGGING_CATEGORY(LOG_DataSourceController, "dataSourceController")
+#include <QDir>
+#include <QStandardPaths>
+
+Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")
 
 class DataSourceController::DataSourceControllerPrivate {
 public:
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 117e771..e3cd44b 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -24,7 +24,6 @@ SCIQLOP_FIND_QT(Core Widgets)
 # ========================
 find_package(sciqlop-core)
 
-message("Librairies inclues dans APP: ${SCIQLOP-CORE_LIBRARIES}")
 SET(LIBRARIES ${SCIQLOP-CORE_LIBRARIES})
 
 INCLUDE_DIRECTORIES(${SCIQLOP-CORE_INCLUDE_DIR})