[openmp] On Windows, fix standalone cmake build #80174
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
openmp:libomp
|
@llvm/pr-subscribers-openmp Author: Alexandre Ganea (aganea) ChangesThis fixes: #80117 Full diff: https://github.com/llvm/llvm-project/pull/80174.diff 1 Files Affected:
diff --git a/openmp/cmake/HandleOpenMPOptions.cmake b/openmp/cmake/HandleOpenMPOptions.cmake
index 201aeabbd3df9..79dfa334d749e 100644
--- a/openmp/cmake/HandleOpenMPOptions.cmake
+++ b/openmp/cmake/HandleOpenMPOptions.cmake
@@ -44,9 +44,9 @@ append_if(OPENMP_HAVE_DATA_SECTIONS "-fdata-sections" CMAKE_C_FLAGS CMAKE_CXX_FL
if (MSVC)
# Disable "warning C4201: nonstandard extension used: nameless struct/union"
- append("-wd4201" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+ append_if(TRUE "-wd4201" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
# Disable "warning C4190: '__kmpc_atomic_cmplx8_rd' has C-linkage specified, but returns
# UDT '__kmp_cmplx64_t' which is incompatible with C"
- append("-wd4190" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+ append_if(TRUE "-wd4190" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
endif()
|
aganea
commented
Jan 31, 2024
| @@ -44,9 +44,9 @@ append_if(OPENMP_HAVE_DATA_SECTIONS "-fdata-sections" CMAKE_C_FLAGS CMAKE_CXX_FL | |||
|
|
|||
| if (MSVC) | |||
| # Disable "warning C4201: nonstandard extension used: nameless struct/union" | |||
| append("-wd4201" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) | |||
| append_if(TRUE "-wd4201" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) | |||
There was a problem hiding this comment.
Using append_if(TRUE ...) because on MSVC silencing unknown warnings is a silent action.
There was a problem hiding this comment.
Can we just use list(APPEND ...) here?
There was a problem hiding this comment.
string(APPEND ...) perhaps but it needs two lines so it's just shorter to write append_if(TRUE ..)
|
|
|
As suggested. |
shiltian
reviewed
Jan 31, 2024
| @@ -9,6 +9,14 @@ if (NOT COMMAND append_if) | |||
| endfunction() | |||
There was a problem hiding this comment.
Then here we can just call append
Tested with the status of this PR (4654c3d), and can confirm that windows build succeeds now. Thanks a lot! |
jhuber6
approved these changes
Jan 31, 2024
llvmbot
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Feb 1, 2024
This fixes: llvm#80117 (cherry picked from commit d2565bb)
smithp35
pushed a commit
to smithp35/llvm-project
that referenced
this pull request
Feb 1, 2024
carlosgalvezp
pushed a commit
to carlosgalvezp/llvm-project
that referenced
this pull request
Feb 1, 2024
llvmbot
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Feb 2, 2024
This fixes: llvm#80117 (cherry picked from commit d2565bb)
agozillon
pushed a commit
to agozillon/llvm-project
that referenced
this pull request
Feb 5, 2024
tstellar
pushed a commit
to tstellar/llvm-project
that referenced
this pull request
Feb 14, 2024
This fixes: llvm#80117 (cherry picked from commit d2565bb)
tstellar
pushed a commit
to tstellar/llvm-project
that referenced
this pull request
Feb 14, 2024
This fixes: llvm#80117 (cherry picked from commit d2565bb)
tstellar
pushed a commit
to tstellar/llvm-project
that referenced
this pull request
Feb 14, 2024
This fixes: llvm#80117 (cherry picked from commit d2565bb)
tstellar
pushed a commit
to tstellar/llvm-project
that referenced
this pull request
Feb 14, 2024
This fixes: llvm#80117 (cherry picked from commit d2565bb)
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes: #80117