Disable local CMake build code for bundled 3rdparty components. diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt index 0476170e075..90abea00e8c 100644 --- a/tensorflow/lite/CMakeLists.txt +++ b/tensorflow/lite/CMakeLists.txt @@ -564,7 +564,7 @@ set(_ALL_TFLITE_HDRS ${_ALL_TFLITE_SRCS}) list(FILTER _ALL_TFLITE_HDRS INCLUDE REGEX ".*\\.h$") target_include_directories(tensorflow-lite PUBLIC $ $ - ${CMAKE_BINARY_DIR}/gemmlowp + ${gemmlowp_ROOT}/include/gemmlowp ) target_link_libraries(tensorflow-lite PUBLIC diff --git a/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake b/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake index 70331ad0a69..a9bd8a0f3bd 100644 --- a/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake +++ b/tensorflow/lite/tools/cmake/modules/Findgemmlowp.cmake @@ -18,7 +18,6 @@ include(gemmlowp) if(gemmlowp_POPULATED) set(GEMMLOWP_FOUND TRUE) - get_target_property(GEMMLOWP_INCLUDE_DIRS gemmlowp INTERFACE_DIRECTORIES) set(GEMMLOWP_LIBRARIES gemmlowp gemmlowp_fixedpoint f='/guix/refs/?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>refslogtreecommitdiff
AgeCommit message (Expand)Author
2024-01-09gnu: ffmpeg-jami: Relocate to (gnu packages video)....To avoid Guile module dependency cycles, inherited packages must be defined in the same module. Use this opportunity to simplify the patches applying mechanism, versioning custom patches the same as for other packages. * gnu/packages/patches/ffmpeg-jami-change-RTCP-ratio.patch: New file. * gnu/packages/patches/ffmpeg-jami-rtp_ext_abs_send_time.patch: Likewise. * gnu/packages/patches/ffmpeg-jami-libopusdec-enable-FEC.patch: Likewise. * gnu/packages/patches/ffmpeg-jami-libopusenc-enable-FEC.patch: Likewise. * gnu/packages/patches/ffmpeg-jami-libopusenc-reload-packet-loss-at-encode.patch: Likewise. * gnu/packages/patches/ffmpeg-jami-remove-mjpeg-log.patch: Likewise. * gnu/packages/patches/ffmpeg-jami-screen-sharing-x11-fix.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/jami.scm (jami-apply-custom-patches): Delete procedure. (%ffmpeg-default-configure-flags): Delete variable. (ffmpeg-compose-configure-flags): Delete procedure. (ffmpeg-jami): Move to... * gnu/packages/video.scm (ffmpeg-jami): ... here. Apply patches to origin and repatriate configure flags. Change-Id: Id374fae18240cd76b224915d80b61422635ccb77 Maxim Cournoyer