GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r31:77f9210cef5f

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

perrinel -

r31:77f9210cef5f

parent child

Context file:

r31:77f9210cef5f

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
             export CCC_CXX=clang++
             export LD=clang++
             export CCC_ANALYZER_VERBOSE=1
             LD_LIBRARY_PATH=/usr/local/lib64
             export LD_LIBRARY_PATH
             rm -rf build_clang-analyzer
             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

app/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 <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");
                 SqpApplication::setApplicationName("SciQLop");
                 MainWindow w;
                 w.show();
                 return a.exec();
             }

app/src/mainwindow.cpp +1 -2

             /*------------------------------------------------------------------------------
             -- 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;
                 }
             }

cmake/sciqlop_params.cmake 0 -11

             #
             # sciqlop_params : Define compilation parameters
             #
             # Debug or release
             #
             # 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
             #SET(SCIQLOP_BUILD_TYPE "Release" CACHE STRING "Choose to compile in Debug or Release mode")
-            #IF(SCIQLOP_BUILD_TYPE MATCHES "Debug")
-            #    MESSAGE (STATUS "Build in Debug")
-            #    SET (CMAKE_BUILD_TYPE "Debug")
-            #    SET (DEBUG_SUFFIX "d")
-            #ELSE()
-            #    MESSAGE (STATUS "Build in Release")
-            #    SET (CMAKE_BUILD_TYPE "Release")
-            #    SET (SCIQLOP_BUILD_TYPE "Release")
-            #    SET (DEBUG_SUFFIX "")
-            #ENDIF()
             IF(CMAKE_BUILD_TYPE MATCHES "Debug")
                 SET (CMAKE_BUILD_TYPE "Debug")
                 SET (DEBUG_SUFFIX "d")
             ELSE()
                 MESSAGE (STATUS "Build in Release")
                 SET (SCIQLOP_BUILD_TYPE "Release")
                 SET (DEBUG_SUFFIX "")
             ENDIF()
             #
             # Need to compile tests?
             #
             OPTION (BUILD_TESTS "Build the tests" OFF)
             ENABLE_TESTING(${BUILD_TESTS})
             #
             # Path to the folder for sciqlop's extern libraries.
             #
             # When looking for an external library in sciqlop, we look to the following
             # folders:
             #   - The specific folder for the library (generally of the form <LIBRARY>_ROOT_DIR
             #   - The global Sciqlop extern folder
             #   - The system folders.
             #
             # If a dependency is found in the global extern folder or a specific folder for
             # the library, then it is installed with the sciqlop libraries. If it is found
             # in the system folders, it is not. This behavior can be overriden with the
             # <LIBRARY>_COPY_SHARED_LIBRARIES flag.
             #
             set(SCIQLOP_EXTERN_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/extern"
                 CACHE PATH "Path to the folder for sciqlop's extern libraries")
             option(SCIQLOP_FORCE_UPDATE_EXT_ROOT_DIR "Force the <LIBRARY>_ROOT_DIR to be updated to the global sciqlop extern folder"
                 OFF)
             if (SCIQLOP_FORCE_UPDATE_EXT_ROOT_DIR)
                 set(libRootDirForceValue FORCE)
             else()
                 set(libRootDirForceValue)
             endif()
             #
             # Static or shared libraries
             #
             OPTION (BUILD_SHARED_LIBS "Build the shared libraries" ON)
             # Generate position independant code (-fPIC)
             SET(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
             #
             # Configure installation directories
             #
             IF (UNIX)
                 SET(defaultBin "bin")
                 SET(defaultInc "include/sciqlop")
                 # 32 or 64 bits compiler
                 IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )
                     SET(defaultLib "lib64/sciqlop")
                 ELSE()
                     SET(defaultLib "lib/sciqlop")
                 ENDIF()
                 SET(defaultDoc "share/docs/sciqlop")
             ELSE()
                 SET(defaultBin "bin")
                 SET(defaultInc "include/sciqlop")
                 SET(defaultLib "lib/sciqlop")
                 SET(defaultDoc "docs/sciqlop")
             ENDIF()
             SET(INSTALL_BINARY_DIR "${defaultBin}" CACHE STRING
                 "Installation directory for binaries")
             SET(INSTALL_LIBRARY_DIR "${defaultLib}" CACHE STRING
                 "Installation directory for libraries")
             SET(INSTALL_INCLUDE_DIR "${defaultInc}" CACHE STRING
                 "Installation directory for headers")
             SET(INSTALL_DOCUMENTATION_DIR "${defaultDoc}" CACHE STRING
                 "Installation directory for documentations")

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