Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMake: Fix CMAKE_C_FLAGS when WITH_OPENMP=ON #1495

Merged
merged 1 commit into from
May 27, 2020
Merged

CMake: Fix CMAKE_C_FLAGS when WITH_OPENMP=ON #1495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ChangeLog.md
View file
Open in desktop
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
View file
Open in desktop
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