[oce] 01/02: Prevent DRAWEXE from being added to OCE_LIBRARIES.

Anton Gladky gladk at moszumanska.debian.org
Mon Apr 17 11:15:05 UTC 2017


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

gladk pushed a commit to branch debian
in repository oce.

commit c25582f09ad560d13d9b725f1948a9a1967112b2
Author: Janus Weil <janus at gcc.gnu.org>
Date:   Fri Apr 14 22:34:45 2017 +0200

    Prevent DRAWEXE from being added to OCE_LIBRARIES.
---
 debian/patches/do_not_add_drawexe.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/do_not_add_drawexe.patch b/debian/patches/do_not_add_drawexe.patch
new file mode 100644
index 0000000..09966a4
--- /dev/null
+++ b/debian/patches/do_not_add_drawexe.patch
@@ -0,0 +1,25 @@
+From 340781368c4d1902887fe6a5b7288cce5eb53456 Mon Sep 17 00:00:00 2001
+From: Janus Weil <janus at gcc.gnu.org>
+Date: Sun, 12 Mar 2017 16:47:28 +0100
+Subject: [PATCH] prevent DRAWEXE from being added to OCE_LIBRARIES * see issue
+ #660
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19e9705..c379b3c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -990,7 +990,9 @@ macro(process_module modulename modules_std)
+ 		list(APPEND modules ${ARGN})
+ 	endif(NOT OCE_DISABLE_X11)
+ 	foreach(module ${modules})
+-		list(APPEND OCE_LIBRARIES ${module})
++		if(NOT module MATCHES ".*EXE")
++			list(APPEND OCE_LIBRARIES ${module})
++		endif()
+ 		set(TOOLKIT_MODULES "")
+ 		set(TOOLKIT_DEPENDS "")
+ 		set(TOOLKIT_INCLUDE_DIRECTORIES "")
diff --git a/debian/patches/series b/debian/patches/series
index 00ec35a..95bb020 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 split-export.patch
 speedup-BRepMesh_test.patch
+do_not_add_drawexe.patch

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



More information about the debian-science-commits mailing list