Skip to content

Commit

Permalink
CMake: Fix CMAKE_C_FLAGS when WITH_OPENMP=ON
Browse files Browse the repository at this point in the history
`CMAKE_C_FLAGS` was set to the value of `CMAKE_CXX_FLAGS` when `WITH_OPENMP=ON`
  • Loading branch information
phcerdan committed May 26, 2020
1 parent 92ab4d0 commit 53f6627
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@
Coeurjolly, [#1436](https://github.com/DGtal-team/DGtal/pull/1436))
- Fixing Travis configuration due to syntax changes in v2
(Roland Denis, [#1465](https://github.com/DGtal-team/DGtal/pull/1465))
- 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,
Expand Down
2 changes: 1 addition & 1 deletion cmake/CheckDGtalOptionalDependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down

0 comments on commit 53f6627

Please sign in to comment.