diff options
| author | Joseph Huber <huberjn@outlook.com> | 2024-05-15 20:44:02 -0500 |
|---|---|---|
| committer | Joseph Huber <huberjn@outlook.com> | 2024-05-15 20:45:19 -0500 |
| commit | f60c699d37c41c46dd0be4ec98e5b4d74e73b2b7 (patch) | |
| tree | 0d16f7fb9dc29a7671884a3b234b3830dca89b2b /openmp/runtime | |
| parent | f0b3654701bde1cf7821d60698b42383edaff9f3 (diff) | |
| download | llvm-f60c699d37c41c46dd0be4ec98e5b4d74e73b2b7.zip llvm-f60c699d37c41c46dd0be4ec98e5b4d74e73b2b7.tar.gz llvm-f60c699d37c41c46dd0be4ec98e5b4d74e73b2b7.tar.bz2 | |
[OpenMP] Fix intermediate header locations for OpenMP
Summary:
A previous patch moved the code here and accidentally overrwrote the
include path that the LSP interface used. This caused incorrect errors
when using clangd with the offload project. This patch removes the
unnecessary header and makes sure we include the correct folder.
Diffstat (limited to 'openmp/runtime')
| -rw-r--r-- | openmp/runtime/src/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt index a2468d0..94eeea6 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt @@ -20,7 +20,7 @@ endif() # Configure omp.h, kmp_config.h and omp-tools.h if necessary configure_file(${LIBOMP_INC_DIR}/omp.h.var ${LIBOMP_HEADERS_INTDIR}/omp.h @ONLY) configure_file(${LIBOMP_INC_DIR}/ompx.h.var ${LIBOMP_HEADERS_INTDIR}/ompx.h @ONLY) -configure_file(kmp_config.h.cmake ${LIBOMP_HEADERS_INTDIR}/kmp_config.h @ONLY) +configure_file(kmp_config.h.cmake kmp_config.h @ONLY) if(${LIBOMP_OMPT_SUPPORT}) configure_file(${LIBOMP_INC_DIR}/omp-tools.h.var ${LIBOMP_HEADERS_INTDIR}/omp-tools.h @ONLY) endif() @@ -55,7 +55,6 @@ include_directories( ${LIBOMP_SRC_DIR}/i18n ${LIBOMP_INC_DIR} ${LIBOMP_SRC_DIR}/thirdparty/ittnotify - ${LIBOMP_HEADERS_INTDIR} ) # Building with time profiling support requires LLVM directory includes. @@ -441,7 +440,7 @@ if(${LIBOMP_OMPT_SUPPORT}) install(FILES ${LIBOMP_HEADERS_INTDIR}/omp-tools.h DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH}) # install under legacy name ompt.h install(FILES ${LIBOMP_HEADERS_INTDIR}/omp-tools.h DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH} RENAME ompt.h) - set(LIBOMP_OMP_TOOLS_INCLUDE_DIR ${LIBOMP_HEADERS_INTDIR} PARENT_SCOPE) + set(LIBOMP_OMP_TOOLS_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() if(${BUILD_FORTRAN_MODULES}) set (destination ${LIBOMP_HEADERS_INSTALL_PATH}) |