diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index 0b1020ab3c355e1a3ddb18aec27cd34baf42ebdc..826f2e7c80b4c4fb7413f0f3402dcd1abe222ca2 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -1,13 +1,12 @@
GET_SOURCE_FILES(SOURCES)
+APPEND_SOURCE_FILES(SOURCES Gmsh)
+
if(NOT Shapelib_FOUND)
list(REMOVE_ITEM SOURCES SHPInterface.h SHPInterface.cpp)
endif()
-if(Qt5XmlPatterns_FOUND)
- APPEND_SOURCE_FILES(SOURCES XmlIO/Qt)
-endif()
-APPEND_SOURCE_FILES(SOURCES Gmsh)
if(Qt5XmlPatterns_FOUND)
+ APPEND_SOURCE_FILES(SOURCES XmlIO/Qt)
APPEND_SOURCE_FILES(SOURCES FEFLOW)
endif()
@@ -22,13 +21,6 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake)
add_library(ApplicationsFileIO ${SOURCES})
target_link_libraries(ApplicationsFileIO DataHolderLib)
-if(Qt5XmlPatterns_FOUND)
- target_link_libraries(ApplicationsFileIO Qt5::Xml Qt5::XmlPatterns)
- if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
- target_link_libraries(ApplicationsFileIO Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
- endif()
-endif()
-
if(Shapelib_FOUND)
target_link_libraries(ApplicationsFileIO ${Shapelib_LIBRARIES})
endif()
diff --git a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
index d15d577f39cdbb9f53ac2b58a2fdc5139b26a926..d926833ae2c6d5686976b519122b771f10c7ec2a 100644
--- a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
+++ b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
@@ -15,7 +15,7 @@
#include <QDomElement>
#include <QString>
-#include <QtXml>
+#include <QtXml/QDomDocument>
#include <logog/include/logog.hpp>
diff --git a/Documentation/README.txt.in b/Documentation/README.txt.in
new file mode 100644
index 0000000000000000000000000000000000000000..51e7b59760ccb63a3d86e3ed1b3a7cb19d72395a
--- /dev/null
+++ b/Documentation/README.txt.in
@@ -0,0 +1,6 @@
+OGS binary package usage
+========================
+
+Start the appropriate executable in the *bin*-folder.
+
+@README_PLATFORM_INSTRUCTIONS@
diff --git a/Jenkinsfile b/Jenkinsfile
index 3a441a02af3d0011c9e217381328a9ccaf50c8e6..571ef5b1bd8f44b0ab449bd10f09d89918779a2b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
-@Library('jenkins-pipeline@1.0.4') _
+@Library('jenkins-pipeline@1.0.5') _
def builders = [:]
def helper = new ogs.helper()
diff --git a/conanfile.py b/conanfile.py
index 6c5ad58ae7f321699b52cbc09523d19cca8e3de4..422e4499aaaebd1d999e9a72d3fa9673089ebe5b 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -2,25 +2,29 @@ from conans import ConanFile, CMake
class OpenGeoSysConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
-
- requires = \
- "Boost/[>=1.56.0]@lasote/stable", \
- "Shapelib/1.3.0@bilke/stable", \
- "VTK/[>=7.1]@bilke/stable", \
- "Eigen3/3.2.9@bilke/stable", \
- "libgeotiff/1.4.2@bilke/stable", \
- "Qt/5.6.2@bilke/testing"
-
generators = "cmake"
+ options = {"gui": [True, False]}
default_options = \
+ "gui=False", \
"Boost:header_only=True", \
"Qt:xmlpatterns=True"
+ def requirements(self):
+ self.requires("Boost/[>=1.56.0]@lasote/stable")
+ self.requires("Eigen3/3.2.9@bilke/stable")
+ self.requires("VTK/[>=7.1]@bilke/stable")
+
+ if self.options.gui:
+ self.requires("Shapelib/1.3.0@bilke/stable")
+ self.requires("libgeotiff/1.4.2@bilke/stable")
+ self.requires("Qt/5.6.2@bilke/testing")
+
def imports(self):
self.copy(pattern="*.dll", dst="bin", src="bin")
self.copy(pattern="*.dylib*", dst="bin", src="lib")
- # self.copy(pattern="*.framework*", dst="bin", src="lib")
+ self.copy(pattern="*.so*", dst="bin", src="lib")
+ self.copy(pattern="*.framework*", dst="bin", src="lib")
self.copy(pattern="*.dll", dst="bin/platforms", src="plugins/platforms")
self.copy(pattern="*.dylib*", dst="bin/platforms", src="plugins/platforms")
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index ef5a6b9ab4c87678a66490626d216049f9394199..59805b107e1b8e7fea4103ffb38a089480ec1dd3 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -117,3 +117,6 @@ if(USE_CONAN)
# Install Qt platform shared libraries
install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/platforms DESTINATION bin OPTIONAL)
endif()
+
+configure_file(Documentation/README.txt.in ${PROJECT_BINARY_DIR}/README.txt)
+install(FILES ${PROJECT_BINARY_DIR}/README.txt DESTINATION .)
diff --git a/scripts/cmake/packaging/PackagingLinux.cmake b/scripts/cmake/packaging/PackagingLinux.cmake
index 1a485fb95ad4e5a689f8cdc30bc790f24db2a6d6..fc3610024fed81b42442ee56623a2336fcd4be88 100644
--- a/scripts/cmake/packaging/PackagingLinux.cmake
+++ b/scripts/cmake/packaging/PackagingLinux.cmake
@@ -23,3 +23,8 @@ if(MODULE_CMD)
RENAME ${MODULE_NAME})
endif()
endif()
+
+set(README_PLATFORM_INSTRUCTIONS
+ "When running the Data Explorer make sure to set the LD_LIBRARY_PATH path to the bin-folder. E.g.:\n\nLD_LIBRARY_PATH=$LD_LIBRARY_PATH:./ ./DataExplorer"
+ CACHE INTERNAL ""
+)
diff --git a/scripts/jenkins/gcc-conan.groovy b/scripts/jenkins/gcc-conan.groovy
index 7fc6ad4a4b1a9078812ec8418ecc11d5832dcb1b..8c7ae920b2ba79d8bc0c2c57f11ac249cc3a40ab 100644
--- a/scripts/jenkins/gcc-conan.groovy
+++ b/scripts/jenkins/gcc-conan.groovy
@@ -41,6 +41,7 @@ image.inside(defaultDockerArgs) {
stage('Data Explorer (Linux-Docker)') {
configure.linux(
cmakeOptions: defaultCMakeOptions + guiCMakeOptions,
+ conanOptions: "-o gui=True",
keepDir: true,
script: this,
useConan: true
diff --git a/scripts/jenkins/msvc.groovy b/scripts/jenkins/msvc.groovy
index ba434311e4d413547cf4686eb277c35372e15e41..78be370bce4721c796d6e6201f32dab550245ee3 100644
--- a/scripts/jenkins/msvc.groovy
+++ b/scripts/jenkins/msvc.groovy
@@ -33,6 +33,7 @@ withEnv(helper.getEnv(this)) {
stage('Data Explorer (Win)') {
configure.win(
cmakeOptions: defaultCMakeOptions + ' ' + guiCMakeOptions, keepDir: true,
+ conanOptions: "-o gui=True",
script: this
)
build.win(script: this)
diff --git a/scripts/jenkins/msvc32.groovy b/scripts/jenkins/msvc32.groovy
index ff26322ce9db2ff0a9ba4a8cd9dc9664487dd4ad..98151f649f055b9fe06bb5a7897bd8ce55de0ea4 100644
--- a/scripts/jenkins/msvc32.groovy
+++ b/scripts/jenkins/msvc32.groovy
@@ -22,6 +22,7 @@ withEnv(helper.getEnv(this, 'x32')) {
configure.win(
arch: 'x86',
cmakeOptions: defaultCMakeOptions + guiCMakeOptions,
+ conanOptions: "-o gui=True",
script: this
)
build.win(script: this)