Merge pull request #2393 from bilke/fix-linux-package

[CMake] Added missing Qt platform plugin to packages

Applications/Utils/OGSFileConverter/CMakeLists.txt

@@ -8,6 +8,9 @@ target_link_libraries(OGSFileConverterLib
     PUBLIC ApplicationsFileIO MathLib QtBase ${VTK_LIBRARIES}
     INTERFACE MeshLib
 )
+if(BUILD_SHARED_LIBS)
+    install(TARGETS OGSFileConverterLib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif()
 
 target_include_directories(OGSFileConverterLib PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}/OGSFileConverterLib_autogen/include)

Jenkinsfile

@@ -245,7 +245,7 @@ pipeline {
         stage('Envinf1 (serial)') {
           when {
             beforeAgent true
-            expression { return stage_required.build || stage_required.full }
+            expression { return params.envinf1_serial && (stage_required.build || stage_required.full) }
           }
           agent { label "envinf1"}
           environment {
@@ -287,7 +287,7 @@ pipeline {
         stage('Envinf1 (parallel)') {
           when {
             beforeAgent true
-            expression { return stage_required.build || stage_required.full }
+            expression { return params.envinf1_parallel && (stage_required.build || stage_required.full) }
           }
           agent { label "envinf1"}
           environment {

scripts/cmake/ConanSetup.cmake

@@ -95,6 +95,7 @@ if(MSVC)
 endif()
 if(UNIX AND NOT APPLE)
     set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.so* -> ./lib")
+    set(CONAN_IMPORTS ${CONAN_IMPORTS} "plugins/platforms, *.so* -> ./bin/platforms")
 endif()
 
 file(TIMESTAMP ${PROJECT_BINARY_DIR}/conan_install_timestamp.txt file_timestamp "%Y.%m.%d")