From 6b928cdad58c278a890e1c0541cbae066bad6604 Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Sat, 4 Nov 2023 19:12:26 -0300 Subject: [PATCH] build: Remove include directories propagation workaround required by CMake <= 3.12 --- .../custom-modules/ns3-module-macros.cmake | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/build-support/custom-modules/ns3-module-macros.cmake b/build-support/custom-modules/ns3-module-macros.cmake index c9c0054d7..a09a1a1b8 100644 --- a/build-support/custom-modules/ns3-module-macros.cmake +++ b/build-support/custom-modules/ns3-module-macros.cmake @@ -297,17 +297,9 @@ function(build_lib) ) 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) + target_link_libraries( + ${lib${BLIB_LIBNAME}}-obj PRIVATE ${ns_libraries_to_link} + ) endif() # set output name of library