[opengm] 111/386: update cmakelists

[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 7ed1b51c5a23a05ec3033b2c40def86d3645df31
Author: joergkappes <kappes at math.uni-heidelberg.de>
Date:   Wed Dec 17 19:12:37 2014 +0100

    update cmakelists
---
 src/unittest/CMakeLists.txt          | 16 ----------------
 src/unittest/learning/CMakeLists.txt | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
index f220c18..63a2545 100644
--- a/src/unittest/CMakeLists.txt
+++ b/src/unittest/CMakeLists.txt
@@ -79,22 +79,6 @@ if(BUILD_TESTING)
       add_test(test-io-hdf5 ${CMAKE_CURRENT_BINARY_DIR}/test-io-hdf5)
    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) 
 
diff --git a/src/unittest/learning/CMakeLists.txt b/src/unittest/learning/CMakeLists.txt
index 52668fd..c07c40a 100644
--- a/src/unittest/learning/CMakeLists.txt
+++ b/src/unittest/learning/CMakeLists.txt
@@ -15,7 +15,23 @@ if(BUILD_TESTING)
       target_link_libraries(test-dataset ${HDF5_LIBRARIES})
       add_test(test-dataset ${CMAKE_CURRENT_BINARY_DIR}/test-dataset)
    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-generalized-hammingloss test_generalized_hammingloss.cxx ${headers})
    add_test(test-generalized-hammingloss ${CMAKE_CURRENT_BINARY_DIR}/test-generalized-hammingloss)
 endif()

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