Commit 2aee653e authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix cmake build errors

parent 8aff9db9

CMakeLists.txt

+8 −8
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ add_library(lib_com ${libComSrcs} ${libComHeaders}) 
if(UNIX)

  target_link_libraries(lib_com PRIVATE m)

endif()

target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug)

target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug lib_util)

if(INCLUDE_SPLIT)

  target_include_directories(lib_com PRIVATE lib_lc3plus)

endif()
@@ -147,13 +147,13 @@ file(GLOB libDebugSrcs "lib_debug/*.c") 
file(GLOB libDebugHeaders "lib_debug/*.h")

add_library(lib_debug ${libDebugSrcs} ${libDebugHeaders})

target_link_libraries(lib_debug lib_com)

target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend)

target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend lib_util)



file(GLOB libEncSrcs "lib_enc/*.c")

file(GLOB libEncHeaders "lib_enc/*.h")

add_library(lib_enc ${libEncSrcs} ${libEncHeaders})

target_link_libraries(lib_enc lib_com lib_debug)

target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend)

target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend lib_util )

if(INCLUDE_SPLIT)

  target_include_directories(lib_enc PRIVATE lib_lc3plus)

endif()
@@ -188,18 +188,18 @@ if(NOT INCLUDE_SPLIT) 
endif()



add_library(lib_rend ${libRendSrcs} ${libRendHeaders})

target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.

target_link_libraries(lib_rend lib_dec lib_com lib_debug lib_util) # Todo refactor: This dependency on lib_dec should be removed.

if(INCLUDE_SPLIT)

  target_link_libraries(lib_rend lib_lc3plus)

endif()

target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc)

target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc lib_util)





file(GLOB libDecSrcs "lib_dec/*.c")

file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_com lib_rend lib_debug)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_util)



file(GLOB libUtilSrcs "lib_util/*.c")

file(GLOB libUtilHeaders "lib_util/*.h")
@@ -207,7 +207,7 @@ if(NOT INCLUDE_SPLIT) 
  list(FILTER libUtilSrcs EXCLUDE REGEX ".*lib_util\/.*split_rend.*\.c$")

endif()

add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})

target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug)

target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug lib_util)

if(INCLUDE_SPLIT)

  target_include_directories(lib_util PRIVATE lib_lc3plus)

endif()
@@ -233,7 +233,7 @@ endif() 


add_executable(IVAS_rend apps/renderer.c)

target_link_libraries(IVAS_rend lib_rend lib_util)

target_include_directories(IVAS_rend PRIVATE lib_enc)

target_include_directories(IVAS_rend PRIVATE lib_enc lib_util)



if(COPY_EXECUTABLES_FROM_BUILD_DIR)

  # Optionally copy executables to the same place where Make puts them (useful for tests that expect executables in specific places)