[Openmp-commits] [PATCH] D82154: [OpenMP][Tool] Fix install directory of ompt-multiplex.h

[Joachim Protze via Phabricator via Openmp-commits]

protze.joachim created this revision.
protze.joachim added reviewers: sylvestre.ledru, jdoerfert.
protze.joachim added a project: OpenMP.
Herald added subscribers: sstefan1, guansong, yaxunl, mgorny.

As raised in https://reviews.llvm.org/D76012, the header is currently installed to $CMAKE_INSTALL_PREFIX/include.
This patch changes the install destination to install next to the other OpenMP headers.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D82154

Files:
  openmp/runtime/CMakeLists.txt
  openmp/runtime/src/CMakeLists.txt
  openmp/tools/multiplex/CMakeLists.txt


Index: openmp/tools/multiplex/CMakeLists.txt
===================================================================
--- openmp/tools/multiplex/CMakeLists.txt
+++ openmp/tools/multiplex/CMakeLists.txt
@@ -4,7 +4,7 @@
   add_library(ompt-multiplex INTERFACE)
   target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
-  install(FILES ompt-multiplex.h DESTINATION include)
+  install(FILES ompt-multiplex.h DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH})
 
   add_subdirectory(tests)
 endif()
Index: openmp/runtime/src/CMakeLists.txt
===================================================================
--- openmp/runtime/src/CMakeLists.txt
+++ openmp/runtime/src/CMakeLists.txt
@@ -288,6 +288,7 @@
   string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION})
   set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
 endif()
+set(LIBOMP_HEADERS_INSTALL_PATH ${LIBOMP_HEADERS_INSTALL_PATH} PARENT_SCOPE)
 if(WIN32)
   install(TARGETS omp RUNTIME DESTINATION bin)
   install(TARGETS ompimp ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}")
Index: openmp/runtime/CMakeLists.txt
===================================================================
--- openmp/runtime/CMakeLists.txt
+++ openmp/runtime/CMakeLists.txt
@@ -384,3 +384,4 @@
 # make these variables available for tools:
 set(LIBOMP_LIBRARY_DIR ${LIBOMP_LIBRARY_DIR} PARENT_SCOPE)
 set(LIBOMP_INCLUDE_DIR ${LIBOMP_INCLUDE_DIR} PARENT_SCOPE)
+set(LIBOMP_HEADERS_INSTALL_PATH ${LIBOMP_HEADERS_INSTALL_PATH} PARENT_SCOPE)
\ No newline at end of file


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D82154.271937.patch
Type: text/x-patch
Size: 1580 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20200619/3c098d13/attachment.bin>