[Openmp-commits] [PATCH] D84148: [openmp] Fix libomp.so copy in multi-config generators.

[David Truby via Phabricator via Openmp-commits]

DavidTruby created this revision.
Herald added subscribers: openmp-commits, sstefan1, guansong, yaxunl, mgorny.
Herald added a reviewer: jdoerfert.
Herald added a project: OpenMP.

This changes the copy command for libomp.so to use the output of the target as
the source of the copy, rather than trying to find it based on
${LIBOMP_LIBRARY_DIR}, which appears to be incorrect in multi-config generator
builds.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D84148

Files:
  openmp/runtime/cmake/LibompExports.cmake


Index: openmp/runtime/cmake/LibompExports.cmake
===================================================================
--- openmp/runtime/cmake/LibompExports.cmake
+++ openmp/runtime/cmake/LibompExports.cmake
@@ -78,7 +78,7 @@
 endif()
 add_custom_command(TARGET omp POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBOMP_EXPORTS_LIB_DIR}
-  COMMAND ${CMAKE_COMMAND} -E copy ${LIBOMP_OUTPUT_DIRECTORY}/${LIBOMP_LIB_FILE} ${LIBOMP_EXPORTS_LIB_DIR}
+  COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:omp> ${LIBOMP_EXPORTS_LIB_DIR}
 )
 
 # Copy Windows import library into exports/ directory post build


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D84148.279179.patch
Type: text/x-patch
Size: 607 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20200720/8aace3eb/attachment.bin>