[opengm] 78/386: fix CMameFile for test

[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 07690a53228a3161514c2d03061804a9db60b4c8
Author: joergkappes <kappes at math.uni-heidelberg.de>
Date:   Wed Dec 17 09:36:31 2014 +0100

    fix CMameFile for test
---
 .../learning/solver/QuadraticSolverFactory.h       |  2 +-
 src/unittest/CMakeLists.txt                        | 28 ++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/include/opengm/learning/solver/QuadraticSolverFactory.h b/include/opengm/learning/solver/QuadraticSolverFactory.h
index db7813b..43ca5bc 100644
--- a/include/opengm/learning/solver/QuadraticSolverFactory.h
+++ b/include/opengm/learning/solver/QuadraticSolverFactory.h
@@ -18,7 +18,7 @@ public:
 	static QuadraticSolverBackend* Create() {
 
 #ifdef WITH_GUROBI
-		return new GurobiBackend();
+	return new GurobiBackend();
 #elif WITH_CPLEX
         return new CplexBackend();
 #endif
diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
index 9fc0f1b..15faf77 100644
--- a/src/unittest/CMakeLists.txt
+++ b/src/unittest/CMakeLists.txt
@@ -79,18 +79,22 @@ if(BUILD_TESTING)
       add_test(test-io-hdf5 ${CMAKE_CURRENT_BINARY_DIR}/test-io-hdf5)
    endif()
 
-  if(WITH_GUROBI)
-    ADD_EXECUTABLE(test-learning test_learning.cxx ${headers})
-    target_link_libraries(test-learning ${GUROBI_CXX_LIBRARY} ${GUROBI_LIBRARY})
-    add_test(test-learning ${CMAKE_CURRENT_BINARY_DIR}/test-learning) 
-  else()
-    if(WITH_CPLEX)
-        ADD_EXECUTABLE(test-learning test_learning.cxx ${headers})
-        target_link_libraries(test-learning ${CPLEX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-        add_test(test-learning ${CMAKE_CURRENT_BINARY_DIR}/test-learning)
-    endif()
-  endif()
-
+   if(WITH_TRWS)
+     if(WITH_GUROBI)
+       ADD_EXECUTABLE(test-learning test_learning.cxx ${headers})
+       target_link_libraries(test-learning ${GUROBI_CXX_LIBRARY} ${GUROBI_LIBRARY})
+       target_link_libraries(test-learning external-library-trws)
+       add_test(test-learning ${CMAKE_CURRENT_BINARY_DIR}/test-learning) 
+     else()
+       if(WITH_CPLEX)
+         ADD_EXECUTABLE(test-learning test_learning.cxx ${headers})
+         target_link_libraries(test-learning ${CPLEX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+         target_link_libraries(test-learning external-library-trws)
+         add_test(test-learning ${CMAKE_CURRENT_BINARY_DIR}/test-learning)
+       endif()
+     endif()
+   endif()
+   
    ADD_EXECUTABLE(test-memoryinfo test_memoryinfo.cxx ${headers})
    add_test(test-memoryinfo ${CMAKE_CURRENT_BINARY_DIR}/test-memoryinfo) 
 

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