From d9499afc72a2056a221a2b65a28aadf42b454fa5 Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Thu, 30 Mar 2023 19:16:47 -0300 Subject: [PATCH] build: properly propagate included directories from dependencies --- .../custom-modules/ns3-module-macros.cmake | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build-support/custom-modules/ns3-module-macros.cmake b/build-support/custom-modules/ns3-module-macros.cmake index 91398da5f..614639c41 100644 --- a/build-support/custom-modules/ns3-module-macros.cmake +++ b/build-support/custom-modules/ns3-module-macros.cmake @@ -193,6 +193,20 @@ function(build_lib) ${lib${BLIB_LIBNAME}} ${exported_libraries} ${private_libraries} ) + if(NOT ${XCODE}) + # Since linking libraries to object libraries in not allowed in older CMake + # releases, we need to import each of their include directories. Otherwise, + # include directories won't be properly propagated + set(temp) + foreach(target ${ns_libraries_to_link}) + list(APPEND temp + "$" + ) + endforeach() + target_include_directories(${lib${BLIB_LIBNAME}}-obj PRIVATE ${temp}) + unset(temp) + endif() + # set output name of library set_target_properties( ${lib${BLIB_LIBNAME}}