Merge pull request #1324 from dcoeurjo/openmpissue

Fixing openmp library link (#1323)
DGtal-team · Jul 28, 2018 · 8f3ca8c · 8f3ca8c
2 parents a395742 + fa3ad85
commit 8f3ca8c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,8 +7,10 @@
     [#1326](https://github.com/DGtal-team/DGtal/pull/1326)
 
 - *Base*
-  - Fixes wrong members in PredicateCombiner (David Coeurjolly,
+  - Fixing wrong members in PredicateCombiner (David Coeurjolly,
     [#1321](https://github.com/DGtal-team/DGtal/pull/1321))
+  - Fixing openmp flags (David Coeurjolly,
+    [#1324](https://github.com/DGtal-team/DGtal/pull/1324))
   - Add assignment operator to ImageContainerByITKImage (Pablo Hernandez,
     [#1336](https://github.com/DGtal-team/DGtal/pull/1336))
 

diff --git a/cmake/CheckDGtalOptionalDependencies.cmake b/cmake/CheckDGtalOptionalDependencies.cmake
@@ -378,8 +378,9 @@ IF(WITH_OPENMP)
     SET(OPENMP_FOUND_DGTAL 1)
     SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
     SET(CMAKE_C_FLAGS  "${CMAKE_CXX_FLAGS} ${OpenMP_C_FLAGS}")
+    set(DGtalLibDependencies ${DGtalLibDependencies} ${OpenMP_CXX_LIBRARIES})
     ADD_DEFINITIONS("-DWITH_OPENMP ")
-    message(STATUS "OpenMP found.")
+    message(STATUS "OpenMP found. Libs: ${OpenMP_CXX_LIBRARIES}")
   ELSE(OPENMP_FOUND)
     message(FATAL_ERROR "OpenMP support not available.")
   ENDIF(OPENMP_FOUND)

diff --git a/src/DGtal/topology/VoxelComplex.ih b/src/DGtal/topology/VoxelComplex.ih
@@ -35,7 +35,6 @@
 #include <boost/property_map/property_map.hpp>
 #include <iostream>
 #ifdef WITH_OPENMP
-// #include <experimental/algorithm>
 #include <omp.h>
 #endif
 //////////////////////////////////////////////////////////////////////////////