GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Pull Request !133

Closed

Pull request !133 Created on by

perrinel

- Remove unused cmake code
- comment omp.h to ensure the compilation from the command line
- Remove Qt_PATH variable from de clang analyzer launcher file since we

Commit flow:

branch:feature/StandardQtForLinux of GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation → branch:develop of GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation

Versions:

Pull request versions not available.

Collapse 3 commits

ver	Time	Author	Commit	Description
`latest`	Fri, 02 Jun 2017 09:05:59	perrinel	`r30:67c2ab4a2f13`	Remove unused cmake code
`latest`	Fri, 02 Jun 2017 09:05:42	perrinel	`r29:6d9ae743e935`	comment omp.h to ensure the compilation from the command line
`latest`	Fri, 02 Jun 2017 09:04:57	perrinel	`r28:fa79454f5abc`	Remove Qt_PATH variable from de clang analyzer launcher file since we assume using the QT native path.
3 commits hidden, click expand to show them.

Collapse all files

cmake/sciqlop_params.cmake 0 -11

@@ -6,17 +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	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	#SET(SCIQLOP_BUILD_TYPE "Release" CACHE STRING "Choose to compile in Debug or Release mode")	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	IF(CMAKE_BUILD_TYPE MATCHES "Debug")	9	IF(CMAKE_BUILD_TYPE MATCHES "Debug")
21	SET (CMAKE_BUILD_TYPE "Debug")	10	SET (CMAKE_BUILD_TYPE "Debug")
22	SET (DEBUG_SUFFIX "d")	11	SET (DEBUG_SUFFIX "d")

Collapse all files

app/src/main.cpp +1 -1

             #include <QProcessEnvironment>
             #include <QThread>
             #include <SqpApplication.h>
-            #include <omp.h>
             #include <qglobal.h>
             int main(int argc, char *argv[])
             {
+                int ad;
                 SqpApplication a(argc, argv);
                 SqpApplication::setOrganizationName("LPP");
                 SqpApplication::setOrganizationDomain("lpp.fr");

app/src/mainwindow.cpp +1 -2

             #include <QDateTime>
             #include <QDir>
             #include <QFileDialog>
-            #include <omp.h>
+            //#include <omp.h>
             //#include <network/filedownloader.h>
             //#include <qlopdatabase.h>
             //#include <qlopsettings.h>
             //#include "amdatxtcodec.h"
             //#include <qlopplotmanager.h>
             MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
             {
                 ui->setupUi(this);

Collapse all files

analyzer/launch-clang-analyzer-linux.sh +1 -3

-            QT_PATH=".../Qt/5.8/gcc_64/lib/cmake/"
             export CC=/usr/libexec/ccc-analyzer
             export CXX=/usr/libexec/c++-analyzer
             export CCC_CC=clang
             mkdir build_clang-analyzer
             cd build_clang-analyzer
-            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/
+            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/
             scan-build -o clang-analyzer-output make -j2

General Comments 3

perrinel

v1 |

|

Auto status change to "Under Review"

perrinel

v1 |

|

Status change > Approved

note

perrinel

v1 |

|

Pull request merged and closed

No TODOs yet

		Pull request merged and closed
		Status change > Approved
		Auto status change to \|new_status\|...

In pull request description:

No Ticket data found.

In commit messages:

No Ticket data found.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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