Skip to content

fix(openmp): fixed compilation with openmp #241

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

Open
majioa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(openmp): fixed compilation with openmp #241

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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ if(WITH_OPEN_MP)
else()
message("using OpenMP for Poisson 3d shell computing")
endif()
list(APPEND CMAKE_C_FLAGS ${OpenMP_C_FLAGS})
list(APPEND CMAKE_CXX_FLAGS ${OpenMP_CXX_FLAGS})
string(APPEND CMAKE_C_FLAGS " ${OpenMP_C_FLAGS}")
string(APPEND CMAKE_CXX_FLAGS " ${OpenMP_CXX_FLAGS}")
set(USE_OPEN_MP 1)
endif()

Expand Down
2 changes: 1 addition & 1 deletion include/general/CMake_defines.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define BIN_AUX_SUBDIR "@BIN_AUX_SUBDIR@"

#cmakedefine __USE_JP2__
#cmakedefine USE_OPEN_MP
#cmakedefine USE_OPEN_MP @USE_OPEN_MP@
#cmakedefine NO_X11
#cmakedefine __QT_5_SHORTCUT_PATCH
#cmakedefine ETA_POLYGON
Expand Down
1 change: 0 additions & 1 deletion src/uti_phgrm/GpGpu/GpGpu_BuildOptions.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#cmakedefine CUDA_ENABLED @OptionCuda@
#cmakedefine USE_OPEN_MP @USE_OPEN_MP@
#cmakedefine OPENCL_ENABLED @OPENCL_ENABLED@
#cmakedefine CPP11THREAD_NOBOOSTTHREAD @CPP11THREAD_NOBOOSTTHREAD@
#cmakedefine NVTOOLS @NVTOOLS@
Expand Down