diff options
| author | Petr Hosek <petrhosek@users.noreply.github.com> | 2022-06-28 21:56:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-28 21:56:48 +0300 |
| commit | 841ea4172ba904fe3536789497f9565f2ef64129 (patch) | |
| tree | e5af525b653a969ef5616c842355ed2872482729 | |
| parent | 32885670cca160939dd28e9d1bcc8b1dede066b5 (diff) | |
Update cpuinfo (#313)
cpuinfo CMake build now defines the cpuinfo::cpuinfo alias so we don't
need to define it in ruy.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| m--------- | third_party/cpuinfo | 0 |
2 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e085ed0..262d704 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ option(RUY_FIND_CPUINFO "Use find_package to find cpuinfo" OFF) # Skip cpuinfo if it was already generated, which can happen when ruy is # a subdirectory in a wider project that already uses cpuinfo. -if (NOT TARGET cpuinfo AND NOT TARGET cpuinfo::cpuinfo) +if (NOT TARGET cpuinfo::cpuinfo) if (RUY_FIND_CPUINFO) find_package(cpuinfo REQUIRED) else() @@ -82,10 +82,6 @@ if (NOT TARGET cpuinfo AND NOT TARGET cpuinfo::cpuinfo) endif() endif() -if (TARGET cpuinfo AND NOT TARGET cpuinfo::cpuinfo) - add_library(cpuinfo::cpuinfo ALIAS cpuinfo) -endif() - # googletest is only needed for tests. Projects embedding ruy as a subdirectory # and not needing to build ruy tests may proceed without a local checkout of # third_party/googletest. diff --git a/third_party/cpuinfo b/third_party/cpuinfo -Subproject b40bae27785787b6dd70788986fd96434cf90ae +Subproject 082deffc80ce517f81dc2f3aebe6ba671fcd09c |