##// END OF EJS Templates
Merge pull request 133 from SCIQLOP-Initialisation feature/StandardQtForLinux...
perrinel -
r31:77f9210cef5f merge
parent child
Show More
@@ -1,6 +1,4
1 1
2 QT_PATH=".../Qt/5.8/gcc_64/lib/cmake/"
3
4 2 export CC=/usr/libexec/ccc-analyzer
5 3 export CXX=/usr/libexec/c++-analyzer
6 4 export CCC_CC=clang
@@ -15,6 +13,6 rm -rf build_clang-analyzer
15 13 mkdir build_clang-analyzer
16 14 cd build_clang-analyzer
17 15
18 scan-build cmake -DCMAKE_PREFIX_PATH=$QT_PATH -DCMAKE_CXX_COMPILER=clazy -DENABLE_ANALYSIS=false -DENABLE_CPPCHECK=false -DENABLE_FORMATTING=false -DENABLE_CHECKSTYLE=false -BUILD_DOCUMENTATION=false -BUILD_TESTS=false -DCMAKE_BUILD_TYPE=Debug ../../SCIQLOP-Initialisation/
16 scan-build cmake -DCMAKE_CXX_COMPILER=clazy -DENABLE_ANALYSIS=false -DENABLE_CPPCHECK=false -DENABLE_FORMATTING=false -DENABLE_CHECKSTYLE=false -BUILD_DOCUMENTATION=false -BUILD_TESTS=false -DCMAKE_BUILD_TYPE=Debug ../../SCIQLOP-Initialisation/
19 17
20 18 scan-build -o clang-analyzer-output make -j2
@@ -23,11 +23,11
23 23 #include <QProcessEnvironment>
24 24 #include <QThread>
25 25 #include <SqpApplication.h>
26 #include <omp.h>
27 26 #include <qglobal.h>
28 27
29 28 int main(int argc, char *argv[])
30 29 {
30 int ad;
31 31 SqpApplication a(argc, argv);
32 32 SqpApplication::setOrganizationName("LPP");
33 33 SqpApplication::setOrganizationDomain("lpp.fr");
@@ -26,7 +26,7
26 26 #include <QDateTime>
27 27 #include <QDir>
28 28 #include <QFileDialog>
29 #include <omp.h>
29 //#include <omp.h>
30 30 //#include <network/filedownloader.h>
31 31 //#include <qlopdatabase.h>
32 32 //#include <qlopsettings.h>
@@ -38,7 +38,6
38 38 //#include "amdatxtcodec.h"
39 39 //#include <qlopplotmanager.h>
40 40
41
42 41 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
43 42 {
44 43 ui->setupUi(this);
@@ -6,17 +6,6
6 6 # As the "NMake Makefiles" forces by default the CMAKE_BUILD_TYPE variable to Debug, SCIQLOP_BUILD_TYPE variable is used to be sure that the debug mode is a user choice
7 7 #SET(SCIQLOP_BUILD_TYPE "Release" CACHE STRING "Choose to compile in Debug or Release mode")
8 8
9 #IF(SCIQLOP_BUILD_TYPE MATCHES "Debug")
10 # MESSAGE (STATUS "Build in Debug")
11 # SET (CMAKE_BUILD_TYPE "Debug")
12 # SET (DEBUG_SUFFIX "d")
13 #ELSE()
14 # MESSAGE (STATUS "Build in Release")
15 # SET (CMAKE_BUILD_TYPE "Release")
16 # SET (SCIQLOP_BUILD_TYPE "Release")
17 # SET (DEBUG_SUFFIX "")
18 #ENDIF()
19
20 9 IF(CMAKE_BUILD_TYPE MATCHES "Debug")
21 10 SET (CMAKE_BUILD_TYPE "Debug")
22 11 SET (DEBUG_SUFFIX "d")
General Comments 0
You need to be logged in to leave comments. Login now