GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r16:51ad7e303234

Merge pull request from SCIQLOP-Initialisation feature/ClangAnalyserIntegration...

perrinel -

r16:51ad7e303234

parent child

Context file:

r16:51ad7e303234

analyzer/cmake/FindClangAnalyzer.cmake created 644 +42 0

@@ -0,0 +1,42
	1	# - try to find scan-build tool
	2	#
	3	# Cache Variables:
	4	# CLANGANALYZER_ROOT_DIR
	5	# CLANGANALYZER_EXECUTABLE
	6	#
	7	# Non-cache variables you might use in your CMakeLists.txt:
	8	# CLANGANALYZER_FOUND
	9	#
	10	# Requires these CMake modules:
	11	# FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
	12
	13	file(TO_CMAKE_PATH "${CLANGANALYZER_ROOT_DIR}" CLANGANALYZER_ROOT_DIR)
	14	set(CLANGANALYZER_ROOT_DIR
	15	"${CLANGANALYZER_ROOT_DIR}"
	16	CACHE
	17	PATH
	18	"Path to search for scan-build")
	19
	20	if(CLANGANALYZER_EXECUTABLE AND NOT EXISTS "${CLANGANALYZER_EXECUTABLE}")
	21	set(CLANGANALYZER_EXECUTABLE "notfound" CACHE PATH FORCE "")
	22	endif()
	23
	24	# If we have a custom path, look there first.
	25	if(CLANGANALYZER_ROOT_DIR)
	26	find_program(CLANGANALYZER_EXECUTABLE
	27	NAMES
	28	scan-build
	29	PATHS
	30	"${CLANGANALYZER_ROOT_DIR}"
	31	PATH_SUFFIXES
	32	bin
	33	NO_DEFAULT_PATH)
	34	endif()
	35
	36	find_program(CLANGANALYZER_EXECUTABLE NAMES scan-build)
	37
	38	IF(NOT("${CLANGANALYZER_EXECUTABLE}" STREQUAL ""))
	39	set(CLANGANALYZER_FOUND TRUE)
	40	endif()
	41
	42	mark_as_advanced(CLANGANALYZER_EXECUTABLE)

analyzer/launch-clang-analyzer-linux.sh created 644 +20 0

@@ -0,0 +1,20
	1
	2	QT_PATH=".../Qt/5.8/gcc_64/lib/cmake/"
	3
	4	export CC=/usr/libexec/ccc-analyzer
	5	export CXX=/usr/libexec/c++-analyzer
	6	export CCC_CC=clang
	7	export CCC_CXX=clang++
	8	export LD=clang++
	9	export CCC_ANALYZER_VERBOSE=1
	10
	11	LD_LIBRARY_PATH=/usr/local/lib64
	12	export LD_LIBRARY_PATH
	13
	14	rm -rf build_clang-analyzer
	15	mkdir build_clang-analyzer
	16	cd build_clang-analyzer
	17
	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/
	19
	20	scan-build -o clang-analyzer-output make -j2

cmake/sciqlop_code_cppcheck.cmake created 644 +52 0

@@ -0,0 +1,52
	1	#
	2	# sciqlop_code_analysis.cmake
	3
	4	# Launch code source analysis with cppcheck. Can be activated with the
	5	# ENABLE_CPPCHECK option.
	6	#
	7	# The following CACHE variables are available:
	8	# * CPPCHECK_EXTRA_ARGS: extra arguments for cppcheck;
	9	# * CPPCHECK_OUTPUT: path to the xml report of cppcheck.
	10	#
	11	# The following variables are used (must be set by the cmake file calling this
	12	# one):
	13	# * ANALYSIS_INPUT_DIRS: directories to analyze;
	14	# * ANALYSIS_EXCLUDE_DIRS: directories to exclude from the analysis.
	15	#
	16
	17	#
	18	# Analyze the source code with cppcheck
	19	#
	20	OPTION (ENABLE_CPPCHECK "Analyze the source code with cppcheck" ON)
	21	IF (ENABLE_CPPCHECK)
	22
	23	# Make sure cppcheck has been found, otherwise the source code can't be
	24	# analyzed
	25	IF (CPPCHECK_FOUND)
	26	SET (CPPCHECK_EXTRA_ARGS --inline-suppr --xml --xml-version=2 --enable="warning,style" --force -v
	27	CACHE STRING "Extra arguments for cppcheck")
	28	MARK_AS_ADVANCED (CPPCHECK_EXTRA_ARGS)
	29
	30	SET (CPPCHECK_OUTPUT "${CMAKE_BINARY_DIR}/cppcheck-report.xml"
	31	CACHE STRING "Output file for the cppcheck report")
	32	MARK_AS_ADVANCED (CPPCHECK_OUTPUT)
	33
	34	SET (CPPCHECK_EXCLUDE_DIRS)
	35	FOREACH (dir ${ANALYSIS_EXCLUDE_DIRS})
	36	LIST (APPEND CPPCHECK_EXCLUDE_DIRS "-i${dir}")
	37	ENDFOREACH ()
	38
	39	# Add the analyze target to launch cppcheck
	40	ADD_CUSTOM_TARGET (cppcheck
	41	COMMAND
	42	${CPPCHECK_EXECUTABLE}
	43	${CPPCHECK_EXTRA_ARGS}
	44	${ANALYSIS_INPUT_DIRS}
	45	${CPPCHECK_EXCLUDE_DIRS}
	46	2> ${CPPCHECK_OUTPUT}
	47	)
	48
	49	ELSE (CPPCHECK_FOUND)
	50	MESSAGE (STATUS "The source code won't be analyzed - Cppcheck not found")
	51	ENDIF (CPPCHECK_FOUND)
	52	ENDIF (ENABLE_CPPCHECK)

.gitignore +1 0

             build/
             CMakeLists.txt.user
+            /.project

analyzer/cmake/Findcppcheck.cmake ~~cmake/CMakeModules/Findcppcheck.cmake~~ renamed 0 0

NO CONTENT: file renamed from cmake/CMakeModules/Findcppcheck.cmake to analyzer/cmake/Findcppcheck.cmake

analyzer/cmake/Findcppcheck.cpp ~~cmake/CMakeModules/Findcppcheck.cpp~~ renamed 0 0

NO CONTENT: file renamed from cmake/CMakeModules/Findcppcheck.cpp to analyzer/cmake/Findcppcheck.cpp

cmake/compiler/compiler.cmake +3 0

             #
             # compiler.cmake : configure the compilation flags
             #
+            message("Compiler id: ${CMAKE_CXX_COMPILER_ID}")
             IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
             	INCLUDE("cmake/compiler/compiler_gnu.cmake")
+            ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+            	INCLUDE("cmake/compiler/compiler_gnu.cmake")
             ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
             	INCLUDE("cmake/compiler/compiler_msvc.cmake")
             ELSE()
                MESSAGE(FATAL_ERROR "Compiler not supported")
             ENDIF()

cmake/find_libs.cmake +3 -1

             #
             # findslibs.cmake
             #
             #
             # Qt
             #
             # Find Qt here so that a message is displayed in the console when executing
             # cmake, but each application must call SCIQLOP_FIND_QT() to load the Qt modules that
             # it needs.
             FIND_PACKAGE(Qt5Core REQUIRED)
             FIND_PACKAGE(Qt5Test REQUIRED)
             FIND_PACKAGE(Qt5Gui REQUIRED)
             #
             # doxygen tools
             #
             FIND_PACKAGE(Doxygen)
             #
-            # Cppcheck tool
+            # Analyzer tools
             #
+            LIST( APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/analyzer/cmake")
             FIND_PACKAGE(cppcheck)
+            FIND_PACKAGE(ClangAnalyzer)
             #
             # Formatting tools
             #
             LIST( APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/formatting/cmake")
             FIND_PACKAGE(vera++)
             FIND_PACKAGE(ClangFormat)

cmake/sciqlop_applications.cmake +1 0

             #
             # Sciqlop_modules.cmake
             #
             # Set ouptut directories
             #
             SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
             SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
             #
             # Compile the core
             #
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/sqpcore")
             #
             # Compile the gui
             #
             #ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/sqpgui")
             #
             # Compile the app
             #
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/sqpapp")
             #
             # Code formatting
             #
             INCLUDE ("cmake/sciqlop_formatting.cmake")
             #
             # Documentation generation
             #
             INCLUDE ("cmake/sciqlop_doxygen.cmake")
             #
             # Source code analysis
             #
             INCLUDE ("cmake/sciqlop_code_analysis.cmake")
+            INCLUDE ("cmake/sciqlop_code_cppcheck.cmake")

cmake/sciqlop_code_analysis.cmake +21 -29

             #
             # sciqlop_code_analysis.cmake
-            # Launch code source analysis with cppcheck. Can be activated with the
+            # Launch code source analysis with CLANGANALYZER. Can be activated with the
-            # ANALYZE_CODE option.
+            # ENABLE_ANALYSIS option.
             #
             # The following CACHE variables are available:
-            #   * CPPCHECK_EXTRA_ARGS: extra arguments for cppcheck;
+            #   * CLANGANALYZER_EXTRA_ARGS: extra arguments for CLANGANALYZER;
-            #   * CPPCHECK_OUTPUT: path to the xml report of cppcheck.
+            #   * CLANGANALYZER_OUTPUT: path to the xml report of CLANGANALYZER.
             #
             # The following variables are used (must be set by the cmake file calling this
             # one):
             #   * ANALYSIS_INPUT_DIRS: directories to analyze;
             #   * ANALYSIS_EXCLUDE_DIRS: directories to exclude from the analysis.
             #
             #
-            # Analyze the source code with cppcheck
+            # Analyze the source code with CLANGANALYZER
             #
-            OPTION (ANALYZE_CODE "Analyze the source code with cppcheck" ON)
+            OPTION (ENABLE_ANALYSIS "Analyze the source code with clang_analyze" ON)
-            IF (ANALYZE_CODE)
+            IF (ENABLE_ANALYSIS)
-                # Make sure cppcheck has been found, otherwise the source code can't be
+                # Make sure CLANGANALYZER has been found, otherwise the source code can't be
                 # analyzed
-                IF (CPPCHECK_FOUND)
+                IF (CLANGANALYZER_FOUND)
-                    SET (CPPCHECK_EXTRA_ARGS --inline-suppr --xml --xml-version=2 --enable="warning,style" --force -v
-                        CACHE STRING "Extra arguments for cppcheck")
-                    MARK_AS_ADVANCED (CPPCHECK_EXTRA_ARGS)
-                    SET (CPPCHECK_OUTPUT "${CMAKE_BINARY_DIR}/cppcheck-report.xml"
+            	SET (CLANGANALYZER_OUTPUT "${CMAKE_BINARY_DIR}/clang-analyzer-ouput"
-                        CACHE STRING "Output file for the cppcheck report")
+                        CACHE STRING "Output file for the CLANGANALYZER report")
-                    MARK_AS_ADVANCED (CPPCHECK_OUTPUT)
+                    MARK_AS_ADVANCED (CLANGANALYZER_OUTPUT)
-                    SET (CPPCHECK_EXCLUDE_DIRS)
+                    SET (CLANGANALYZER_EXTRA_ARGS -o ${CLANGANALYZER_OUTPUT}
-                    FOREACH (dir ${ANALYSIS_EXCLUDE_DIRS})
+                        CACHE STRING "Extra arguments for CLANGANALYZER")
-                        LIST (APPEND CPPCHECK_EXCLUDE_DIRS "-i${dir}")
+                    MARK_AS_ADVANCED (CLANGANALYZER_EXTRA_ARGS)
-                    ENDFOREACH ()
-                    # Add the analyze target to launch cppcheck
+                    # Add the analyze target to launch CLANGANALYZER
                     ADD_CUSTOM_TARGET (analyze
                         COMMAND
-                        ${CPPCHECK_EXECUTABLE}
+                        sh ${CMAKE_CURRENT_SOURCE_DIR}/analyzer/launch-clang-analyzer-linux.sh
-                        ${CPPCHECK_EXTRA_ARGS}
-                        ${ANALYSIS_INPUT_DIRS}
-                        ${CPPCHECK_EXCLUDE_DIRS}
-> ${CPPCHECK_OUTPUT}
                         )
-                ELSE (CPPCHECK_FOUND)
+                ELSE (CLANGANALYZER_FOUND)
-                    MESSAGE (STATUS "The source code won't be analyzed - Cppcheck not found")
+                    MESSAGE (STATUS "The source code won't be analyzed - CLANGANALYZER not found")
-                ENDIF (CPPCHECK_FOUND)
+                ENDIF (CLANGANALYZER_FOUND)
-            ENDIF (ANALYZE_CODE)
+            ENDIF (ENABLE_ANALYSIS)

sqpapp/src/main.cpp +1 -1

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "mainwindow.h"
             #include <QApplication>
             #include <QProcessEnvironment>
             #include <QThread>
-            #include <omp.h>
+            //#include <omp.h>
             #include <qglobal.h>
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QApplication::setOrganizationName("LPP");
                 QApplication::setOrganizationDomain("lpp.fr");
                 QApplication::setApplicationName("SciQLop");
                 MainWindow w;
                 w.show();
                 return a.exec();
             }

sqpapp/src/mainwindow.cpp +1 -1

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "mainwindow.h"
             #include "ui_mainwindow.h"
             #include <QAction>
             #include <QDate>
             #include <QDateTime>
             #include <QDir>
             #include <QFileDialog>
-            #include <omp.h>
+            //#include <omp.h>
             //#include <network/filedownloader.h>
             //#include <qlopdatabase.h>
             //#include <qlopsettings.h>
             //#include <qlopgui.h>
             //#include <spacedata.h>
             //#include "qlopcore.h"
             //#include "qlopcodecmanager.h"
             //#include "cdfcodec.h"
             //#include "amdatxtcodec.h"
             //#include <qlopplotmanager.h>
             MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
             {
                 ui->setupUi(this);
                 /*    QLopGUI::registerMenuBar(menuBar());
                     this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
                     this->m_progressWidget = new QWidget();
                     this->m_progressLayout = new QVBoxLayout(this->m_progressWidget);
                     this->m_progressWidget->setLayout(this->m_progressLayout);
                     this->m_progressWidget->setWindowModality(Qt::WindowModal);
                     m_progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int));
                     for(int i=0;i<OMP_THREADS;i++)
                     {
                         this->m_progress.append(new QProgressBar(this->m_progressWidget));
                         this->m_progress.last()->setMinimum(0);
                         this->m_progress.last()->setMaximum(100);
                         this->m_progressLayout->addWidget(this->m_progress.last());
                         this->m_progressWidget->hide();
                         this->m_progressThreadIds[i] = -1;
                     }
                     this->m_progressWidget->setWindowTitle("Loading File");
                     const QList<QLopService*>ServicesToLoad=QList<QLopService*>()
                             << QLopCore::self()
                             << QLopPlotManager::self()
                             << QLopCodecManager::self()
                             << FileDownloader::self()
                             << QLopDataBase::self()
                             << SpaceData::self();
                     CDFCodec::registerToManager();
                     AMDATXTCodec::registerToManager();
                     for(int i=0;i<ServicesToLoad.count();i++)
                     {
                         qDebug()<<ServicesToLoad.at(i)->serviceName();
                         ServicesToLoad.at(i)->initialize(); //must be called before getGUI
                         QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
                         if(wdgt)
                         {
                             wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
                             this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
                         }
                         PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
                     }*/
             }
             MainWindow::~MainWindow()
             {
                 delete ui;
             }
             void MainWindow::changeEvent(QEvent *e)
             {
                 QMainWindow::changeEvent(e);
                 switch (e->type()) {
                     case QEvent::LanguageChange:
                         ui->retranslateUi(this);
                         break;
                     default:
                         break;
                 }
             }

formatting/clangAnalyser/launch-clang-analyzer.sh removed 0 -114

NO CONTENT: file was removed

General Comments 0

Write
Preview

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

No TODOs yet

	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