summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Churbanov <Andrey.Churbanov@intel.com>2019-05-13 16:07:37 +0000
committerAndrey Churbanov <Andrey.Churbanov@intel.com>2019-05-13 16:07:37 +0000
commit7f63e8c0a69e8a28c221e1bf772d35f25f1f48fc (patch)
treeb2ebaf855ee4f0472b752ca8976dbfcef7d7e20a
parentcf5a8eb7cd3a9c90f5667f146350cf0d0c1489bb (diff)
downloadbcm5719-llvm-7f63e8c0a69e8a28c221e1bf772d35f25f1f48fc.tar.gz
bcm5719-llvm-7f63e8c0a69e8a28c221e1bf772d35f25f1f48fc.zip
Fixed creation of aliases in Windows build.
Changed file extension of the destination of the copy of libomp.lib (it was mistakely .dll, now it is .lib) in installation on Windows. Differential Revision: https://reviews.llvm.org/D61673 llvm-svn: 360595
-rw-r--r--openmp/runtime/src/CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
index 28d0acee7f6..ad7b12bb516 100644
--- a/openmp/runtime/src/CMakeLists.txt
+++ b/openmp/runtime/src/CMakeLists.txt
@@ -301,8 +301,7 @@ if(WIN32)
install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_LIB_FILE}\"
\"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_IMP_LIB_FILE}\"
- \"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR})")
- endforeach()
+ \"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR})" endforeach()
else()
install(TARGETS omp ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
OpenPOWER on IntegriCloud