GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r25:bbb3a36891b9

Ajout du logger compatible Linux à la compilation.

perrinel -

r25:bbb3a36891b9

parent child

Context file:

r25:bbb3a36891b9

config/QtProject/qtlogging.ini created 755 +4 0

@@ -0,0 +1,4
	1	[Rules]
	2	*.debug=false
	3	SqpApplication.debug=true
	4	DataSourceController.debug=true

app/CMakeLists.txt 0 -1

             # ========================
             find_package(sciqlop-gui)
-            message("Librairies inclues dans APP: ${SCIQLOP-GUI_LIBRARIES}")
             SET(LIBRARIES ${SCIQLOP-GUI_LIBRARIES})
             SET(EXTERN_SHARED_LIBRARIES)

cmake/sciqlop_applications.cmake +12 -1

             #
             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
             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
             #

cmake/sciqlop_formatting.cmake 0 -2

                         LIST(APPEND EXCLUSIONS EXCLUSION ${e})
                     ENDFOREACH()
-                    message("Exclusions de vera++: ${EXCLUSIONS}")
                     ADD_VERA_TARGETS(${CHECKSTYLE_INPUT_FILES}
                         ADD_TO_ALL
                         PROFILE "sciqlop"

core/src/DataSource/DataSourceController.cpp +4 -1

             #include <QMutex>
             #include <QThread>
-            Q_LOGGING_CATEGORY(LOG_DataSourceController, "dataSourceController")
+            #include <QDir>
+            #include <QStandardPaths>
+            Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")
             class DataSourceController::DataSourceControllerPrivate {
             public:

gui/CMakeLists.txt 0 -1

             # ========================
             find_package(sciqlop-core)
-            message("Librairies inclues dans APP: ${SCIQLOP-CORE_LIBRARIES}")
             SET(LIBRARIES ${SCIQLOP-CORE_LIBRARIES})
             INCLUDE_DIRECTORIES(${SCIQLOP-CORE_INCLUDE_DIR})

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages