HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1398:728acc3a845d

Made more consistent plugin install path with CMake, removed useless plugin lookup path...

jeandet -

r1398:728acc3a845d

parent child

Context file:

r1398:728acc3a845d

app/src/Main.cpp +11 -11

             /*------------------------------------------------------------------------------
             -- 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 <qglobal.h>
             #include <PluginManager/PluginManager.h>
             #include <QDir>
             #include <QtPlugin>
             #include <QLoggingCategory>
             Q_LOGGING_CATEGORY(LOG_Main, "Main")
-            namespace {
+            namespace
+            {
             const auto PLUGIN_DIRECTORY_NAME = QStringLiteral("plugins");
             } // namespace
-            int main(int argc, char *argv[])
+            int main(int argc, char* argv[])
             {
             #ifdef QT_STATICPLUGIN
                 Q_IMPORT_PLUGIN(MockPlugin)
                 Q_IMPORT_PLUGIN(AmdaPlugin)
                 Q_INIT_RESOURCE(amdaresources);
             #endif
                 Q_INIT_RESOURCE(sqpguiresources);
                 SqpApplication::setOrganizationName("LPP");
                 SqpApplication::setOrganizationDomain("lpp.fr");
                 SqpApplication::setApplicationName("SciQLop");
                 QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-                SqpApplication a{argc, argv};
+                SqpApplication a { argc, argv };
                 MainWindow w;
                 w.show();
                 // Loads plugins
-                auto pluginDir = QDir{a.applicationDirPath()};
+                auto pluginDir = QDir { a.applicationDirPath() };
                 auto pluginLookupPath = {
-                    a.applicationDirPath(),
-                    a.applicationDirPath() + "/" + PLUGIN_DIRECTORY_NAME,
                     a.applicationDirPath() + "/../lib64/SciQlop",
                     a.applicationDirPath() + "/../lib64/sciqlop",
                     a.applicationDirPath() + "/../lib/SciQlop",
                     a.applicationDirPath() + "/../lib/sciqlop",
-                    a.applicationDirPath() + "/../plugins",
                 };
             #if _WIN32 || _WIN64
                 pluginDir.mkdir(PLUGIN_DIRECTORY_NAME);
                 pluginDir.cd(PLUGIN_DIRECTORY_NAME);
             #endif
-                PluginManager pluginManager{};
+                PluginManager pluginManager {};
-                for (auto &&path : pluginLookupPath) {
+                for (auto&& path : pluginLookupPath)
-                    QDir directory{path};
-                    if (directory.exists()) {
+                    QDir directory { path };
+                    if (directory.exists())
+                    {
                         qCDebug(LOG_Main())
                             << QObject::tr("Plugin directory: %1").arg(directory.absolutePath());
                         pluginManager.loadPlugins(directory);
                     }
                 }
                 pluginManager.loadStaticPlugins();
                 return a.exec();
             }

plugins/amda/CMakeLists.txt +1 -1

             include_directories(include)
             FILE (GLOB_RECURSE amdaplugin_SRCS
                     include/*.h
                     src/*.cpp
                     resources/*.qrc
                     )
             set(AMDA_server_type hybrid CACHE STRING "AMDA server type selected at CMake configure time")
             set(AMDA_SERVER_TYPE "hybrid;amdatest;localhost" CACHE STRING
               "List of possible for AMDA server type")
             set_property(CACHE AMDA_server_type PROPERTY STRINGS ${AMDA_SERVER_TYPE})
             add_definitions(-DSCIQLOP_AMDA_SERVER="${AMDA_server_type}")
             add_definitions(-DAMDAPLUGIN_LIB)
             add_definitions(-DAMDA_LIB)
             add_definitions(-DQT_PLUGIN)
             add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
             if(NOT BUILD_SHARED_LIBS)
                 add_definitions(-DQT_STATICPLUGIN)
             endif()
             add_library(amdaplugin ${amdaplugin_SRCS})
             SET_TARGET_PROPERTIES(amdaplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
             target_link_libraries(amdaplugin PUBLIC sciqlopgui)
             install(TARGETS amdaplugin
                 ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
                 LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
-                RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR})
+                RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQlop)
             include(sciqlop_tests)
             add_definitions(-DAMDA_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
             declare_test(TestAmdaParser TestAmdaParser tests/TestAmdaParser.cpp "amdaplugin;Qt5::Test")
             declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParser.cpp "amdaplugin;Qt5::Test")
             declare_test(TestAmdaAcquisition TestAmdaAcquisition tests/TestAmdaAcquisition.cpp "amdaplugin;Qt5::Test")
             declare_test(TestAmdaFuzzing TestAmdaFuzzing "tests/TestAmdaFuzzing.cpp;tests/FuzzingValidators.cpp;tests/FuzzingUtils.cpp;tests/FuzzingOperations.cpp;tests/FuzzingDefs.cpp" "amdaplugin;Qt5::Test")
             if(PyWrappers)
                 if(MINGW)
                     add_definitions(-D_hypot=hypot)
                 endif()
                 pybind11_add_module(pytestamda tests/PyTestAmdaWrapper.cpp)
                 target_link_libraries(pytestamda PUBLIC amdaplugin)
                 target_link_libraries(pytestamda PUBLIC pysciqlop)
                 #pybind11_add_module(pytestamdalib SHARED tests/PyTestAmdaWrapper.cpp)
                 add_library(pytestamdalib tests/PyTestAmdaWrapper.cpp)
                 target_link_libraries(pytestamdalib PUBLIC pybind11::module)
                 target_link_libraries(pytestamdalib PUBLIC pybind11::embed)
                 target_link_libraries(pytestamdalib PUBLIC amdaplugin)
                 target_link_libraries(pytestamdalib PUBLIC pysciqlop)
                 GET_PROPERTY(CORE_PYTHON_PATH GLOBAL PROPERTY CORE_PYTHON_PATH)
                 declare_test(TestAmdaFileParserEmbed TestAmdaFileParserEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
                 target_compile_definitions(TestAmdaFileParserEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py")
                 set_tests_properties(TestAmdaFileParserEmbed  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
                 declare_test(TestAmdaDownloadEmbed TestAmdaDownloadEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
                 target_compile_definitions(TestAmdaDownloadEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py")
                 set_tests_properties(TestAmdaDownloadEmbed  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
                 declare_test(TestAmdaMiniFuzzEmbed TestAmdaMiniFuzzEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
                 target_compile_definitions(TestAmdaMiniFuzzEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaMiniFuzz.py")
                 set_tests_properties(TestAmdaMiniFuzzEmbed  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
                 find_package(PythonInterp 3 REQUIRED)
                 add_test(NAME TestAmdaFileParser
                   COMMAND ${PYTHON_EXECUTABLE}
                     ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py
                     TestAmdaFileParser)
                 set_tests_properties(TestAmdaFileParser  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
                 add_test(NAME TestAmdaDownload
                   COMMAND ${PYTHON_EXECUTABLE}
                     ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py
                     TestAmdaDownload)
                 set_tests_properties(TestAmdaDownload  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
             endif(PyWrappers)

plugins/mockplugin/CMakeLists.txt +1 -1

             include_directories(include)
             FILE (GLOB_RECURSE mockplugin_SRCS
                     include/*.h
                     src/*.cpp
                     resources/*.qrc
                     )
             add_definitions(-DQT_PLUGIN)
             add_definitions(-DPLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/mockplugin.json")
             if(NOT BUILD_SHARED_LIBS)
                 add_definitions(-DQT_STATICPLUGIN)
             endif()
             add_library(mockplugin ${mockplugin_SRCS})
             SET_TARGET_PROPERTIES(mockplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
             target_link_libraries(mockplugin sciqlopgui)
             install(TARGETS mockplugin
                 ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
                 LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
-                RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR})
+                RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}/SciQlop)
             include(sciqlop_tests)
             add_definitions(-DMOCKPLUGIN_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
             add_definitions(-DMOCKPLUGIN_LIB)
             #declare_test(TestCosinusAcquisition TestCosinusAcquisition tests/TestCosinusAcquisition.cpp "mockplugin;Qt5::Test")
             if(PyWrappers)
                 if(MINGW)
                     add_definitions(-D_hypot=hypot)
                 endif()
                 pybind11_add_module(pytestmockplugin tests/PyTestMockPluginWrapper.cpp)
                 target_link_libraries(pytestmockplugin PUBLIC mockplugin)
                 target_link_libraries(pytestmockplugin PUBLIC pysciqlop)
             endif()

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