From f560aa45fff0da83081447cf346d35963a7b05f9 Mon Sep 17 00:00:00 2001
From: marc emerit <marc.emerit@orange.com>
Date: Mon, 29 Apr 2024 17:05:26 +0200
Subject: [PATCH] update cmakelists

---
 scripts/binauralRenderer_interface/CMakeLists.txt        | 9 +++++++--
 .../Table_Format_Converter/CMakeLists.txt                | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/binauralRenderer_interface/CMakeLists.txt b/scripts/binauralRenderer_interface/CMakeLists.txt
index e51ab3b214..54b670e899 100644
--- a/scripts/binauralRenderer_interface/CMakeLists.txt
+++ b/scripts/binauralRenderer_interface/CMakeLists.txt
@@ -9,9 +9,11 @@ set(IVAS_TRUNK_DEC_PATH ${IVAS_TRUNK_PATH}/lib_dec)
 set(IVAS_TRUNK_REND_PATH ${IVAS_TRUNK_PATH}/lib_rend)
 set(IVAS_TRUNK_ENC_PATH ${IVAS_TRUNK_PATH}/lib_enc)
 set(IVAS_TRUNK_COM_PATH ${IVAS_TRUNK_PATH}/lib_com)
+set(IVAS_TRUNK_ISAR_PATH ${IVAS_TRUNK_PATH}/lib_isar)
+set(IVAS_TRUNK_LC3_PATH ${IVAS_TRUNK_PATH}/lib_lc3plus)
 set(IVAS_TRUNK_DEBUG_PATH ${IVAS_TRUNK_PATH}/lib_debug)
 
-option(USE_MATLAB_ENG "Use matlab engine" OFF) # allows to use sofa file as input to the exe, but on windows requires to register matlab as a com server type in matlab "comserver('register')"" 
+option(USE_MATLAB_ENG "Use matlab engine" OFF) # allows to use sofa file as input to the exe, but on windows requires to register matlab as a com server type in matlab "comserver('register')""
 find_package(Matlab REQUIRED)
 message("Matlab_VERSION = ${Matlab_VERSION}")
 message("Matlab_ROOT_DIR = ${Matlab_ROOT_DIR}")
@@ -27,7 +29,8 @@ message("Matlab_MX_LIBRARY = ${Matlab_MX_LIBRARY}")
 message("Matlab_MEX_LIBRARY = ${Matlab_MEX_LIBRARY}")
 message("Matlab_ENGINE_LIBRARY = ${Matlab_ENGINE_LIBRARY}")
 message("Matlab_DATAARRAY_LIBRARY = ${Matlab_DATAARRAY_LIBRARY}")
-include_directories(${Matlab_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_DEBUG_PATH})
+include_directories(${Matlab_INCLUDE_DIRS} ${IVAS_TRUNK_UTIL_PATH} ${IVAS_TRUNK_ENC_PATH} ${IVAS_TRUNK_DEC_PATH} ${IVAS_TRUNK_REND_PATH} ${IVAS_TRUNK_COM_PATH} ${IVAS_TRUNK_ISAR_PATH} ${IVAS_TRUNK_LC3_PATH} ${IVAS_TRUNK_DEBUG_PATH})
+
 if(USE_MATLAB_ENG)
     string(REPLACE "mex" "eng" Matlab_ENG_LIBRARY ${Matlab_MEX_LIBRARY})
     add_definitions(-DUSE_MATLAB_ENG)
@@ -71,9 +74,11 @@ add_library(${PROJECT_NAME}_lib STATIC ${SOURCE_FILES_C} ${SOURCE_FILES_H})
 add_executable(${PROJECT_NAME} generate_crend_ivas_tables_from_sofa.c)
 
 target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib ${Matlab_MAT_LIBRARY} ${Matlab_MX_LIBRARY})
+
 if(UNIX AND NOT APPLE)
     target_link_libraries(${PROJECT_NAME} libstdc++.so.6 -lm -ldl)
 endif()
+
 if(USE_MATLAB_ENG)
     target_link_libraries(${PROJECT_NAME} ${Matlab_ENG_LIBRARY})
 endif()
diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt b/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt
index 3bd7ec1f4b..6692b4de21 100644
--- a/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt
+++ b/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt
@@ -19,9 +19,10 @@ set(IVAS_ENC_PATH ${IVAS_PATH}/lib_enc)
 set(IVAS_COM_PATH ${IVAS_PATH}/lib_com)
 set(IVAS_REND_PATH ${IVAS_PATH}/lib_rend)
 set(IVAS_DEBUG_PATH ${IVAS_PATH}/lib_debug)
-set(IVAS_LC3PLUS_PATH ${IVAS_PATH}/lc3plus)
+set(IVAS_LC3PLUS_PATH ${IVAS_PATH}/lib_lc3plus)
+set(IVAS_ISAR_PATH ${IVAS_PATH}/lib_isar)
 
-include_directories(${IVAS_UTIL_PATH} ${IVAS_ENC_PATH} ${IVAS_DEC_PATH} ${IVAS_COM_PATH} ${IVAS_REND_PATH} ${IVAS_DEBUG_PATH} ${IVAS_LC3PLUS_PATH})
+include_directories(${IVAS_UTIL_PATH} ${IVAS_ENC_PATH} ${IVAS_DEC_PATH} ${IVAS_COM_PATH} ${IVAS_REND_PATH} ${IVAS_DEBUG_PATH} ${IVAS_LC3PLUS_PATH} ${IVAS_ISAR_PATH})
 
 set(SOURCE_FILES_C
   ${IVAS_REND_PATH}/ivas_rom_binauralRenderer.c
@@ -40,4 +41,3 @@ add_executable(${PROJECT_NAME} generate_tables_from_rom_to_bin.c)
 target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib)
 
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:${PROJECT_NAME}>" "${CMAKE_CURRENT_SOURCE_DIR}/")
-
-- 
GitLab