Skip to content

Commit

Permalink
(#24554) Revert "llvm-openmp: match FindOpenMP.cmake output, add MSVC…
Browse files Browse the repository at this point in the history
… support"

* Revert "(#22353) llvm-openmp: match FindOpenMP.cmake output, add MSVC support"

This reverts commit a4e1f4f.

* Update conanfile.py
  • Loading branch information
jcar87 authored Jul 9, 2024
1 parent 64eb987 commit bf342a7
Show file tree
Hide file tree
Showing 18 changed files with 482 additions and 334 deletions.
158 changes: 0 additions & 158 deletions recipes/llvm-openmp/all/cmake/conan-llvm-openmp-vars.cmake.in

This file was deleted.

55 changes: 48 additions & 7 deletions recipes/llvm-openmp/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
sources:
"18.1.8":
openmp:
url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/openmp-18.1.8.src.tar.xz"
sha256: "60ed57245e73894e4a2a89b15889f367bd906abfe6d3f92e1718223d4b496150"
cmake:
url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/cmake-18.1.8.src.tar.xz"
sha256: "59badef592dd34893cd319d42b323aaa990b452d05c7180ff20f23ab1b41e837"
"17.0.6":
openmp:
url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/openmp-17.0.6.src.tar.xz"
Expand Down Expand Up @@ -46,8 +39,56 @@ sources:
"11.1.0":
url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/openmp-11.1.0.src.tar.xz"
sha256: "d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e"
"10.0.0":
url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/openmp-10.0.0.src.tar.xz"
sha256: "3b9ff29a45d0509a1e9667a0feb43538ef402ea8cfc7df3758a01f20df08adfa"
"9.0.1":
url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/openmp-9.0.1.src.tar.xz"
sha256: "5c94060f846f965698574d9ce22975c0e9f04c9b14088c3af5f03870af75cace"
"8.0.1":
url: "https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/openmp-8.0.1.src.tar.xz"
sha256: "3e85dd3cad41117b7c89a41de72f2e6aa756ea7b4ef63bb10dcddf8561a7722c"
patches:
"17.0.4":
- patch_file: "patches/17/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
"16.0.6":
- patch_file: "patches/16/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
"15.0.7":
- patch_file: "patches/15/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
"14.0.6":
- patch_file: "patches/14/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
"13.0.1":
- patch_file: "patches/13/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
"12.0.1":
- patch_file: "patches/12/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
"11.1.0":
- patch_file: "patches/11/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
- patch_file: "patches/11/0002-fix-armv8-build.patch"
patch_description: "Fix build issues on armv8 architecture"
patch_type: "portability"
"10.0.0":
- patch_file: "patches/10/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
"9.0.1":
- patch_file: "patches/8/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
"8.0.1":
- patch_file: "patches/8/0001-disable-build-testing.patch"
patch_description: "Disable building of tools, gdb-plugin, tests and docs"
patch_type: "conan"
Loading

0 comments on commit bf342a7

Please sign in to comment.