[opengm] 233/386: Find package OpenMP and build the subgradient ssvm test with those flags set

[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 b69a0efac9d8f07266359ba32325575955b46abb
Author: Carsten Haubold <carstenhaubold at googlemail.com>
Date:   Wed Jan 14 15:18:14 2015 +0100

    Find package OpenMP and build the subgradient ssvm test with those flags set
---
 CMakeLists.txt                       |  4 +++-
 src/unittest/learning/CMakeLists.txt | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bb9dad..2508635 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -471,9 +471,11 @@ else()
 endif(WITH_MPLP)
 
 #--------------------------------------------------------------
-# thread lib
+# thread libs
 #--------------------------------------------------------------
 find_package(Threads)
+find_package(OpenMp)
+
 
 #--------------------------------------------------------------
 # rt lib
diff --git a/src/unittest/learning/CMakeLists.txt b/src/unittest/learning/CMakeLists.txt
index 51f2672..4bbf402 100644
--- a/src/unittest/learning/CMakeLists.txt
+++ b/src/unittest/learning/CMakeLists.txt
@@ -37,9 +37,13 @@ if(BUILD_TESTING)
 
 
     if(WITH_CPLEX)
-        ADD_EXECUTABLE(test-subgradient-ssvm test_subgradient_ssvm.cxx ${headers})
-        target_link_libraries(test-subgradient-ssvm ${CPLEX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-        add_test(test-subgradient-ssvm ${CMAKE_CURRENT_BINARY_DIR}/test-subgradient-ssvm)
+        if(OPENMP_FOUND)
+            ADD_EXECUTABLE(test-subgradient-ssvm test_subgradient_ssvm.cxx ${headers})
+            SET_TARGET_PROPERTIES(test-subgradient-ssvm PROPERTIES COMPILE_FLAGS "${OpenMP_CXX_FLAGS}")
+            SET_TARGET_PROPERTIES(test-subgradient-ssvm PROPERTIES LINK_FLAGS "${OpenMP_CXX_FLAGS}")
+            target_link_libraries(test-subgradient-ssvm ${CPLEX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+            add_test(test-subgradient-ssvm ${CMAKE_CURRENT_BINARY_DIR}/test-subgradient-ssvm)
+        endif()
     endif()
 
   add_executable(test-generalized-hammingloss test_generalized_hammingloss.cxx ${headers})

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