[Openmp-commits] [PATCH] D86419: fix omp post-generation event statement error on windows

[Ahmidou Lyazidi via Phabricator via Openmp-commits]

ahmidou created this revision.
ahmidou added a reviewer: AndreyChurbanov.
Herald added subscribers: openmp-commits, mgorny.
Herald added a project: OpenMP.
ahmidou requested review of this revision.
Herald added a reviewer: jdoerfert.
Herald added a subscriber: sstefan1.

some path were missing the configuration name folder and the openmp build was failling


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D86419

Files:
  openmp/runtime/cmake/LibompExports.cmake
  openmp/runtime/src/CMakeLists.txt


Index: openmp/runtime/src/CMakeLists.txt
===================================================================
--- openmp/runtime/src/CMakeLists.txt
+++ openmp/runtime/src/CMakeLists.txt
@@ -207,9 +207,9 @@
     # Get generated import library from creating omp
     get_target_property(LIBOMP_IMPORT_LIB_DIRECTORY omp ARCHIVE_OUTPUT_DIRECTORY)
     if(LIBOMP_IMPORT_LIB_DIRECTORY)
-      set(LIBOMP_GENERATED_IMP_LIB ${LIBOMP_IMPORT_LIB_DIRECTORY}/${LIBOMP_GENERATED_IMP_LIB_FILENAME})
+      set(LIBOMP_GENERATED_IMP_LIB ${LIBOMP_IMPORT_LIB_DIRECTORY}/$(ConfigurationName)/${LIBOMP_GENERATED_IMP_LIB_FILENAME})
     else()
-      set(LIBOMP_GENERATED_IMP_LIB ${CMAKE_CURRENT_BINARY_DIR}/${LIBOMP_GENERATED_IMP_LIB_FILENAME})
+      set(LIBOMP_GENERATED_IMP_LIB ${CMAKE_CURRENT_BINARY_DIR}/$(ConfigurationName)/${LIBOMP_GENERATED_IMP_LIB_FILENAME})
     endif()
     set_source_files_properties(${LIBOMP_GENERATED_IMP_LIB} PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
     # Create new import library that is just the previously created one + kmp_import.cpp
Index: openmp/runtime/cmake/LibompExports.cmake
===================================================================
--- openmp/runtime/cmake/LibompExports.cmake
+++ openmp/runtime/cmake/LibompExports.cmake
@@ -89,6 +89,6 @@
   endif()
   add_custom_command(TARGET ${LIBOMP_IMP_LIB_TARGET} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBOMP_EXPORTS_LIB_DIR}
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBOMPIMP_OUTPUT_DIRECTORY}/${LIBOMP_IMP_LIB_FILE} ${LIBOMP_EXPORTS_LIB_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBOMPIMP_OUTPUT_DIRECTORY}/$(ConfigurationName)/${LIBOMP_IMP_LIB_FILE} ${LIBOMP_EXPORTS_LIB_DIR}
   )
 endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D86419.287252.patch
Type: text/x-patch
Size: 1702 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20200823/d763b40c/attachment.bin>