| @@ -0,0 +1,4 | |||
|
|
1 | [Rules] | |
|
|
2 | *.debug=false | |
|
|
3 | SqpApplication.debug=true | |
|
|
4 | DataSourceController.debug=true | |
| @@ -0,0 +1,3 | |||
|
|
1 | # On ignore toutes les règles vera++ pour le fichier spimpl | |
|
|
2 | Common/spimpl\.h:\d+:.* | |
|
|
3 | ||
| @@ -0,0 +1,4 | |||
|
|
1 | # On ignore toutes les règles vera++ pour le fichier spimpl | |
|
|
2 | ||
|
|
3 | .*IPSIS_S04_METHOD.*found: Q_DECLARE_LOGGING_CATEGORY.* | |
|
|
4 | .*IPSIS_S04_VARIABLE.*found: impl.* | |
| @@ -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 | |
| @@ -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,9 +26,17 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 | # |
|
|
37 | # Vera++ exclusion files | |
|
|
38 | LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/formatting/vera-exclusions/exclusions.txt) | |
|
|
39 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES) | |
|
|
26 | 40 | INCLUDE ("cmake/sciqlop_formatting.cmake") |
|
|
27 | 41 | |
|
|
28 | 42 | # |
| @@ -17,6 +17,15 | |||
|
|
17 | 17 | # SET (DEBUG_SUFFIX "") |
|
|
18 | 18 | #ENDIF() |
|
|
19 | 19 | |
|
|
20 | IF(CMAKE_BUILD_TYPE MATCHES "Debug") | |
|
|
21 | SET (CMAKE_BUILD_TYPE "Debug") | |
|
|
22 | SET (DEBUG_SUFFIX "d") | |
|
|
23 | ELSE() | |
|
|
24 | MESSAGE (STATUS "Build in Release") | |
|
|
25 | SET (SCIQLOP_BUILD_TYPE "Release") | |
|
|
26 | SET (DEBUG_SUFFIX "") | |
|
|
27 | ENDIF() | |
|
|
28 | ||
|
|
20 | 29 | # |
|
|
21 | 30 | # Need to compile tests? |
|
|
22 | 31 | # |
| @@ -57,7 +57,7 SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPCORE_LIBRARY_NAME} ${EXTERN_SHARED_LIBRARIES | |||
|
|
57 | 57 | LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES}) |
|
|
58 | 58 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES) |
|
|
59 | 59 | # Vera++ exclusion files |
|
|
60 |
|
|
|
|
60 | LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt) | |
|
|
61 | 61 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES) |
|
|
62 | 62 | |
|
|
63 | 63 | # |
| @@ -30,7 +30,6 | |||
|
|
30 | 30 | #include <memory> |
|
|
31 | 31 | #include <type_traits> |
|
|
32 | 32 | |
|
|
33 | ||
|
|
34 | 33 | #if defined _MSC_VER && _MSC_VER < 1900 // MS Visual Studio before VS2015 |
|
|
35 | 34 | #define SPIMPL_NO_CPP11_NOEXCEPT |
|
|
36 | 35 | #define SPIMPL_NO_CPP11_CONSTEXPR |
| @@ -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: |
| @@ -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}) |
| @@ -18,6 +18,7 Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication) | |||
|
|
18 | 18 | * method will ba able to access it. |
|
|
19 | 19 | * You can load a data source driver plugin then create a data source. |
|
|
20 | 20 | */ |
|
|
21 | ||
|
|
21 | 22 | class SqpApplication : public QApplication { |
|
|
22 | 23 | Q_OBJECT |
|
|
23 | 24 | public: |
| @@ -8,10 +8,9 Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication") | |||
|
|
8 | 8 | class SqpApplication::SqpApplicationPrivate { |
|
|
9 | 9 | public: |
|
|
10 | 10 | SqpApplicationPrivate() {} |
|
|
11 | ~SqpApplicationPrivate() | |
|
|
11 | virtual ~SqpApplicationPrivate() | |
|
|
12 | 12 | { |
|
|
13 | 13 | qCInfo(LOG_SqpApplication()) << tr("Desctruction du SqpApplicationPrivate"); |
|
|
14 | ; | |
|
|
15 | 14 | m_DataSourceControllerThread.quit(); |
|
|
16 | 15 | m_DataSourceControllerThread.wait(); |
|
|
17 | 16 | } |
General Comments 0
You need to be logged in to leave comments.
Login now