diff options
| author | Benoit Jacob <benoitjacob@google.com> | 2021-01-21 01:04:41 +0300 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-01-21 01:05:04 +0300 |
| commit | d65bcd7add7b5e7587355e4301c1b8ce335a877a (patch) | |
| tree | e976cfe508a5cbe11dc5d8aecbedadc935ce3b00 /cmake | |
| parent | c200f59184b6d0bda940aadfbaafa957a72f291c (diff) | |
Fixes for builds in open source projects with cpuinfo and googletest deps.
- Following XNNPACK's example, in CMakeLists.txt, skip including our own
third_party/ directories if the target is already defined. This means that
IREE embedding ruy as a third_party/ dep does not need to have its
submodules checked out, ruy can use IREE's own cpuinfo and googletest.
- Switch open-source builds to using the stripped-include-paths flavor
of cpuinfo (like IREE is already using).
PiperOrigin-RevId: 352871140
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ruy_include_directories.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/ruy_include_directories.cmake b/cmake/ruy_include_directories.cmake index d2e0ad1..e9b50a9 100644 --- a/cmake/ruy_include_directories.cmake +++ b/cmake/ruy_include_directories.cmake @@ -20,7 +20,7 @@ function(ruy_include_directories NAME DEPS) if (cpuinfo IN_LIST DEPS) target_include_directories(${NAME} PRIVATE - "${PROJECT_SOURCE_DIR}/third_party/cpuinfo" + "${PROJECT_SOURCE_DIR}/third_party/cpuinfo/include" ) endif() if ((gtest IN_LIST DEPS) OR |