[scram] 01/03: Patch the GUI cmake config for static builds

Olzhas Rakhimov rakhimov-guest at moszumanska.debian.org
Wed Aug 2 01:04:34 UTC 2017


This is an automated email from the git hooks/post-receive script.

rakhimov-guest pushed a commit to branch master
in repository scram.

commit be3e0917623e1d3c59b52b6f76ec086a0bf580ca
Author: rakhimov <ol.rakhimov at gmail.com>
Date:   Tue Aug 1 15:52:17 2017 -0700

    Patch the GUI cmake config for static builds
---
 debian/patches/0001-GUI-Fix-the-static-build.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/0001-GUI-Fix-the-static-build.patch b/debian/patches/0001-GUI-Fix-the-static-build.patch
new file mode 100644
index 0000000..91833c0
--- /dev/null
+++ b/debian/patches/0001-GUI-Fix-the-static-build.patch
@@ -0,0 +1,35 @@
+From 39d4b1b9dbec907e942d770008c28b379c1fa03a Mon Sep 17 00:00:00 2001
+From: rakhimov <ol.rakhimov at gmail.com>
+Date: Tue, 1 Aug 2017 15:46:59 -0700
+Subject: [PATCH] GUI: Fix the static build
+
+---
+ gui/CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
+index 5f93c72..baad8a4 100644
+--- a/gui/CMakeLists.txt
++++ b/gui/CMakeLists.txt
+@@ -72,12 +72,16 @@ set(GUI_DEP_LIBS  # TODO: Link with shared libraries on Windows instead.
+   ${LIBS} scramcore
+   Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::OpenGL Qt5::PrintSupport Qt5::Concurrent)
+ 
++if(WIN32)
++  target_link_libraries(scramgui PRIVATE ${GUI_DEP_LIBS})  # TODO: Remove.
++else()
++  target_link_libraries(scramgui ${GUI_DEP_LIBS})  # TODO: Make default.
++endif()
++
+ if(INSTALL_LIBS)
+   if(WIN32)
+-    target_link_libraries(scramgui PRIVATE ${GUI_DEP_LIBS})  # TODO: Remove.
+     install(TARGETS scramgui RUNTIME DESTINATION bin COMPONENT gui)
+   else()
+-    target_link_libraries(scramgui ${GUI_DEP_LIBS})  # TODO: Make default.
+     set_target_properties(scramgui
+       PROPERTIES
+       INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/scram"
+-- 
+2.7.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6a5f273
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-GUI-Fix-the-static-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scram.git



More information about the debian-science-commits mailing list