Merge branch 'master' into PNGClean

DGtal-team · May 27, 2020 · 880930b · 880930b
2 parents 1f7fafd + 21eef21
commit 880930b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -97,7 +97,9 @@
     (Roland Denis, [#1465](https://github.com/DGtal-team/DGtal/pull/1465))
   - Compression of png files used in for the documentation
     (preparing 1.1 release), (David Coeurjolly, [#1494](https://github.com/DGtal-team/DGtal/pull/1494))
-
+  - Fix `CMAKE_C_FLAGS` when `WITH_OPENMP=ON`
+    (Pablo Hernandez-Cerdan, [#1495](https://github.com/DGtal-team/DGtal/pull/1495))
+
 - *Mathematics*
   - Put SimpleMatrix * scalar operation in DGtal namespace (Jacques-Olivier Lachaud,
     [#1412](https://github.com/DGtal-team/DGtal/pull/1412))

diff --git a/cmake/CheckDGtalOptionalDependencies.cmake b/cmake/CheckDGtalOptionalDependencies.cmake
@@ -362,7 +362,7 @@ IF(WITH_OPENMP)
   IF(OPENMP_FOUND)
     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(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
     set(DGtalLibDependencies ${DGtalLibDependencies} ${OpenMP_CXX_LIBRARIES})
     ADD_DEFINITIONS("-DWITH_OPENMP ")
     message(STATUS "OpenMP found. Libs: ${OpenMP_CXX_LIBRARIES}")