fix omp post-generation event statement error on windows

[ahmidou]

Summary

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

[AndreyChurbanov]

This change causes standalone Windows build to fail:

LINK : fatal error LNK1181: cannot open input file '\$$(ConfigurationName)/libomp.dll.lib'
make[2]: * [runtime/src/libomp.lib] Error 157
make[1]: * [runtime/src/CMakeFiles/ompimp.dir/all] Error 2
make: *** [all] Error 2

Looks like there is no ConfigurationName variable set my build.

[AndreyChurbanov]

LGTM

[ahmidou]

Hi,
So is the standalone Windows build not failing anymore?

Thanks

Le lun. 17 mai 2021 à 17:08, Andrey Churbanov via Phabricator <
[e-mail]> a écrit :

AndreyChurbanov accepted this revision.
AndreyChurbanov added a comment.
This revision is now accepted and ready to land.

LGTM

Repository:

rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION

https://reviews.llvm.org/D86419/new/

https://reviews.llvm.org/D86419

[AndreyChurbanov]

In D86419#2768808, @ahmidou wrote:

Hi,
So is the standalone Windows build not failing anymore?

Sorry, I've accepted the patch prematurely I think.
With this patch build is fixed for cmake generators "Visual Studio...", but is broken for e.g. "Unix Makefiles" (I guess this is regardless of whether the build is standalone).
I've accepted the patch when I tried to build clang and standalone libomp using "Visual Studio 16 2019" cmake generator. But "Unix Makefiles" generator still does not work.
Searching for ConfigurationName I found the page https://cmake.org/cmake/help/latest/variable/CMAKE_CFG_INTDIR.html that suggests to use CMAKE_CFG_INTDIR.
And indeed the CMAKE_CFG_INTDIR has the value "$(ConfigurationName)" for "Visual Studio 16 2019" generator and the value "." for "Unix Makefiles" generator, thus the build works for both generators if I replaced $(ConfigurationName) with ${CMAKE_CFG_INTDIR} in your patch.
Could you please check if this replacement works for you?

[mscuttari]

I'm sorry for resurrecting this old patch, but I'm encountering the same problem when building OpenMP on Windows with MSVC.
Applying the patch (to different lines, as the code meanwhile expanded a bit) made the compilation to succeed, so I think it may be worth landing this to the main branch.

[protze.joachim]

openmp/runtime/cmake/LibompExports.cmake

92

If I understand @AndreyChurbanov comment right, this change should only apply for MSVC instead of all WIN32, so an additional IF is necessary here.

openmp/runtime/cmake/LibompExports.cmake

 # Copy Windows import library into exports/ directory post build
 if(WIN32)
   get_target_property(LIBOMPIMP_OUTPUT_DIRECTORY ${LIBOMP_IMP_LIB_TARGET} ARCHIVE_OUTPUT_DIRECTORY)
   if(NOT LIBOMPIMP_OUTPUT_DIRECTORY)
     set(LIBOMPIMP_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
   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()

openmp/runtime/src/CMakeLists.txt

set_target_properties(omp PROPERTIES
     IMPORT_PREFIX "" IMPORT_SUFFIX "" # control generated import library name when building omp
     ARCHIVE_OUTPUT_NAME ${LIBOMP_GENERATED_IMP_LIB_FILENAME}
   )
 
   if(MSVC)
     # 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
     add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp)
     set_target_properties(ompimp PROPERTIES
       PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}"
       LINKER_LANGUAGE C
     )