diff --git a/openmp/runtime/CMakeLists.txt b/openmp/runtime/CMakeLists.txt --- a/openmp/runtime/CMakeLists.txt +++ b/openmp/runtime/CMakeLists.txt @@ -114,7 +114,7 @@ # Turning this to FALSE aids parallel builds to not interfere with each other. # Currently, the testsuite module expects the just built OpenMP library to be located inside the exports/ # directory. TODO: have testsuite run under llvm-lit directly. We can then get rid of copying to exports/ -set(LIBOMP_COPY_EXPORTS TRUE CACHE STRING +set(LIBOMP_COPY_EXPORTS FALSE CACHE STRING "Should exports be copied into source exports/ directory?") # HWLOC-support diff --git a/openmp/runtime/cmake/LibompExports.cmake b/openmp/runtime/cmake/LibompExports.cmake --- a/openmp/runtime/cmake/LibompExports.cmake +++ b/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 $ ${LIBOMP_EXPORTS_LIB_DIR} ) # Copy Windows import library into exports/ directory post build