[opengm] 333/386: fixed fusion for cc

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository opengm.

commit 655291d26e729978d26b6078ace6c522e093bb29
Author: DerThorsten <thorsten.beier at iwr.uni-heidelberg.de>
Date:   Fri Mar 25 13:08:51 2016 +0100

    fixed fusion for cc
---
 include/opengm/inference/intersection_based_inf.hxx            | 2 +-
 src/interfaces/python/opengm/inference/inference.cpp           | 2 +-
 src/interfaces/python/opengm/inference/pyIntersectionBased.cxx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/opengm/inference/intersection_based_inf.hxx b/include/opengm/inference/intersection_based_inf.hxx
index ae0653f..415cfe1 100644
--- a/include/opengm/inference/intersection_based_inf.hxx
+++ b/include/opengm/inference/intersection_based_inf.hxx
@@ -19,7 +19,7 @@
 #include "opengm/inference/infandflip.hxx"
 #include "opengm/inference/messagepassing/messagepassing.hxx"
 
-#ifdef WITH_CPLEX
+#if defined(WITH_CPLEX) || defined(WITH_QPBO) || (defined(WITH_PLANARITY) && defined(WITH_BLOSSOM5)) 
 #include "opengm/inference/auxiliary/fusion_move/permutable_label_fusion_mover.hxx"
 #endif
 
diff --git a/src/interfaces/python/opengm/inference/inference.cpp b/src/interfaces/python/opengm/inference/inference.cpp
index e40e538..425bcd3 100644
--- a/src/interfaces/python/opengm/inference/inference.cpp
+++ b/src/interfaces/python/opengm/inference/inference.cpp
@@ -70,7 +70,7 @@
 
 
 
-#if !defined(NOVIGRA) && (defined(WITH_QPBO) || (defined(WITH_BLOSSOM5) && defined(WITH_PLANARITY) ) )
+#if (defined(WITH_VIGRA) && defined(WITH_QPBO) ) || (defined(WITH_BLOSSOM5) && defined(WITH_PLANARITY) ) 
 #include "pyCgc.hxx"
 #include "pyIntersectionBased.hxx"
 #endif
diff --git a/src/interfaces/python/opengm/inference/pyIntersectionBased.cxx b/src/interfaces/python/opengm/inference/pyIntersectionBased.cxx
index 496bc14..bd0d40c 100644
--- a/src/interfaces/python/opengm/inference/pyIntersectionBased.cxx
+++ b/src/interfaces/python/opengm/inference/pyIntersectionBased.cxx
@@ -1,4 +1,4 @@
-#ifndef NOVIGRA
+#if defined(WITH_CPLEX) || defined(WITH_QPBO) || (defined(WITH_PLANARITY) && defined(WITH_BLOSSOM5)) 
 #include <boost/python.hpp>
 #include <string>
 #include "inf_def_visitor.hxx"

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