##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Ajout du logger compatible Linux à la compilation.
perrinel -
r25:bbb3a36891b9
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,4
1 [Rules]
2 *.debug=false
3 SqpApplication.debug=true
4 DataSourceController.debug=true
Show file before | Show file after | Hide comments
@@ -16,7 +16,6 SCIQLOP_FIND_QT(Core Widgets)
16 16 # ========================
17 17 find_package(sciqlop-gui)
18 18
19 message("Librairies inclues dans APP: ${SCIQLOP-GUI_LIBRARIES}")
20 19 SET(LIBRARIES ${SCIQLOP-GUI_LIBRARIES})
21 20 SET(EXTERN_SHARED_LIBRARIES)
22 21
Show file before | Show file after | Hide comments
@@ -5,7 +5,13
5 5 #
6 6 SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
7 7 SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
8
8 IF (UNIX)
9 SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
10 ELSEIF(WIN32)
11 SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}/app/QtProject)
12 ELSE()
13 SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
14 ENDIF()
9 15
10 16 #
11 17 # Compile the diffents modules
@@ -20,6 +26,11 ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/gui")
20 26
21 27 ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")
22 28
29 # LOGGER
30 set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini")
31 FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH})
32
33
23 34 #
24 35 # Code formatting
25 36 #
Show file before | Show file after | Hide comments
@@ -34,8 +34,6 IF (ENABLE_CHECKSTYLE)
34 34 LIST(APPEND EXCLUSIONS EXCLUSION ${e})
35 35 ENDFOREACH()
36 36
37 message("Exclusions de vera++: ${EXCLUSIONS}")
38
39 37 ADD_VERA_TARGETS(${CHECKSTYLE_INPUT_FILES}
40 38 ADD_TO_ALL
41 39 PROFILE "sciqlop"
Show file before | Show file after | Hide comments
@@ -3,7 +3,10
3 3 #include <QMutex>
4 4 #include <QThread>
5 5
6 Q_LOGGING_CATEGORY(LOG_DataSourceController, "dataSourceController")
6 #include <QDir>
7 #include <QStandardPaths>
8
9 Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")
7 10
8 11 class DataSourceController::DataSourceControllerPrivate {
9 12 public:
Show file before | Show file after | Hide comments
@@ -24,7 +24,6 SCIQLOP_FIND_QT(Core Widgets)
24 24 # ========================
25 25 find_package(sciqlop-core)
26 26
27 message("Librairies inclues dans APP: ${SCIQLOP-CORE_LIBRARIES}")
28 27 SET(LIBRARIES ${SCIQLOP-CORE_LIBRARIES})
29 28
30 29 INCLUDE_DIRECTORIES(${SCIQLOP-CORE_INCLUDE_DIR})
General Comments 0
You need to be logged in to leave comments. Login now