From 222c810b07ffc635fc7908d121e97e4d65ccc5c8 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Fri, 2 Dec 2022 13:39:00 +1100
Subject: fix build errors

---
 tools/cmake/common.cmake | 2 ++
 tools/cmake/libmad.cmake | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'tools/cmake')

diff --git a/tools/cmake/common.cmake b/tools/cmake/common.cmake
index 53a6a243..577a77d5 100644
--- a/tools/cmake/common.cmake
+++ b/tools/cmake/common.cmake
@@ -25,3 +25,5 @@ set(EXTRA_WARNINGS "-Wshadow" "-Wnon-virtual-dtor" "-Wunused"
 # just be used to setting flags that our external dependencies requires.
 # Otherwise, prefer adding per-component build flags to keep things neat.
 idf_build_set_property(COMPILE_OPTIONS "-DLV_CONF_INCLUDE_SIMPLE" APPEND)
+
+include($ENV{PROJ_PATH}/tools/cmake/extra-libs.cmake)
diff --git a/tools/cmake/libmad.cmake b/tools/cmake/libmad.cmake
index 5beb96cb..7be23494 100644
--- a/tools/cmake/libmad.cmake
+++ b/tools/cmake/libmad.cmake
@@ -1,5 +1,6 @@
 set(LIBMAD_SRC "$ENV{PROJ_PATH}/lib/libmad")
 set(LIBMAD_BIN "${CMAKE_CURRENT_BINARY_DIR}/libmad")
+set(LIBMAD_INCLUDE "${LIBMAD_BIN}/include")
 
 externalproject_add(libmad_build
   SOURCE_DIR "${LIBMAD_SRC}"
@@ -7,13 +8,13 @@ externalproject_add(libmad_build
   CONFIGURE_COMMAND ${LIBMAD_SRC}/configure CC=${CMAKE_C_COMPILER} --srcdir=${LIBMAD_SRC} --prefix=${LIBMAD_BIN} --host=xtensa-elf --disable-debugging --disable-shared
   BUILD_COMMAND make
   INSTALL_COMMAND make install
-  BUILD_BYPRODUCTS "${LIBMAD_BIN}/libmad.a"
+  BUILD_BYPRODUCTS "${LIBMAD_BIN}/lib/libmad.a" "${LIBMAD_INCLUDE}/mad.h"
 )
 
  add_library(libmad STATIC IMPORTED GLOBAL)
  add_dependencies(libmad libmad_build)
 
  set_target_properties(libmad PROPERTIES IMPORTED_LOCATION
-   "${LIBMAD_BIN}/libmad.a")
+   "${LIBMAD_BIN}/lib/libmad.a")
  set_target_properties(libmad PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-   "${LIBMAD_BIN}")
+   "${LIBMAD_INCLUDE}")
-- 
cgit v1.2.3