mirror of https://github.com/microsoft/vcpkg.git
[vcpkg baseline][llvm] Fix file conflicts for libiomp5md.dll (#30457)
* [vcpkg_baseline][llvm] Fix file conflicts for libiomp5md.dll * update version * add llvm * version * Correct files * update version * lib * vdb * fix before install * version * fix in end line * version * bin not lib * version * test patch * version * revert intel-mkl and disable libomp on WIN32 * version * disable create symlink * version * Optimization patch * version * remove sapce * version * patch name * vdb
This commit is contained in:
parent
9eb91c199e
commit
9cc4d431a0
|
|
@ -0,0 +1,37 @@
|
|||
diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
|
||||
index e795032..5e8cba5 100644
|
||||
--- a/openmp/runtime/src/CMakeLists.txt
|
||||
+++ b/openmp/runtime/src/CMakeLists.txt
|
||||
@@ -201,6 +201,7 @@ endif()
|
||||
set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
|
||||
|
||||
# Add symbolic links to libomp
|
||||
+if(0)
|
||||
if(NOT WIN32)
|
||||
add_custom_command(TARGET omp POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBOMP_LIB_FILE}
|
||||
@@ -210,6 +211,8 @@ if(NOT WIN32)
|
||||
WORKING_DIRECTORY ${LIBOMP_LIBRARY_DIR}
|
||||
)
|
||||
endif()
|
||||
+endif()
|
||||
+
|
||||
set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
|
||||
|
||||
# Create *.inc before compiling any sources
|
||||
@@ -354,6 +357,7 @@ endif()
|
||||
if(WIN32)
|
||||
install(TARGETS omp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||
install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}")
|
||||
+ if(0)
|
||||
# Create aliases (regular copies) of the library for backwards compatibility
|
||||
set(LIBOMP_ALIASES "libiomp5md")
|
||||
foreach(alias IN LISTS LIBOMP_ALIASES)
|
||||
@@ -362,6 +366,7 @@ if(WIN32)
|
||||
install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_IMP_LIB_FILE}\"
|
||||
\"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR}\")")
|
||||
endforeach()
|
||||
+ endif()
|
||||
else()
|
||||
|
||||
install(TARGETS omp ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
|
||||
|
|
@ -14,6 +14,7 @@ vcpkg_from_github(
|
|||
0009-fix-tools-install-path.patch
|
||||
0010-fix-libffi.patch
|
||||
0011-fix-install-bolt.patch
|
||||
0012-disable-libomp-aliases.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(
|
||||
|
|
@ -237,6 +238,7 @@ vcpkg_cmake_configure(
|
|||
-DLLVM_BUILD_TESTS=OFF
|
||||
-DLLVM_INCLUDE_BENCHMARKS=OFF
|
||||
-DLLVM_BUILD_BENCHMARKS=OFF
|
||||
-DLIBOMP_INSTALL_ALIASES=OFF
|
||||
# Force TableGen to be built with optimization. This will significantly improve build time.
|
||||
-DLLVM_OPTIMIZED_TABLEGEN=ON
|
||||
"-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "llvm",
|
||||
"version": "14.0.6",
|
||||
"port-version": 1,
|
||||
"description": "The LLVM Compiler Infrastructure.",
|
||||
"homepage": "https://llvm.org",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -4826,7 +4826,7 @@
|
|||
},
|
||||
"llvm": {
|
||||
"baseline": "14.0.6",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"lmdb": {
|
||||
"baseline": "0.9.29",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "321559ad78e1741e396fc25d5f51d4f99d1f40fc",
|
||||
"version": "14.0.6",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "a5e218fee4a3c429f4e2c9586de5083c1b13c7da",
|
||||
"version": "14.0.6",
|
||||
|
|
|
|||
Loading…
Reference in New Issue