From ddf49b31efc58a8be9195f12461eac317ff2c4e0 Mon Sep 17 00:00:00 2001
From: Gabriel Ferreira <gabrielcarvfer@gmail.com>
Date: Wed, 27 Jul 2022 19:07:03 -0300
Subject: [PATCH] build: reduce scope of NS3_ENABLE_EXAMPLES flag

Prevents recompilation of modules when tests are enabled
---
 .../custom-modules/ns3-module-macros.cmake          | 13 +++++++++++++
 build-support/macros-and-definitions.cmake          |  6 ------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build-support/custom-modules/ns3-module-macros.cmake b/build-support/custom-modules/ns3-module-macros.cmake
index 52f331891..3616678a6 100644
--- a/build-support/custom-modules/ns3-module-macros.cmake
+++ b/build-support/custom-modules/ns3-module-macros.cmake
@@ -97,6 +97,19 @@ function(build_lib)
            ${CMAKE_HEADER_OUTPUT_DIRECTORY}/version-defines.h
       )
     endif()
+
+    # Enable examples as tests suites
+    if(${ENABLE_EXAMPLES} AND ${ENABLE_TESTS})
+      if(NOT ${XCODE})
+        target_compile_definitions(
+          ${lib${BLIB_LIBNAME}}-obj PRIVATE NS3_ENABLE_EXAMPLES
+        )
+      else()
+        target_compile_definitions(
+          ${lib${BLIB_LIBNAME}} PRIVATE NS3_ENABLE_EXAMPLES
+        )
+      endif()
+    endif()
   endif()
   set_target_properties(
     ${lib${BLIB_LIBNAME}}
diff --git a/build-support/macros-and-definitions.cmake b/build-support/macros-and-definitions.cmake
index e43eda439..224096de5 100644
--- a/build-support/macros-and-definitions.cmake
+++ b/build-support/macros-and-definitions.cmake
@@ -1156,12 +1156,6 @@ macro(process_options)
     add_definitions(-DNS3_ASSERT_ENABLE)
   endif()
 
-  # Enable examples as tests suites
-  if(${ENABLE_EXAMPLES})
-    set(NS3_ENABLE_EXAMPLES "1")
-    add_definitions(-DNS3_ENABLE_EXAMPLES -DCMAKE_EXAMPLE_AS_TEST)
-  endif()
-
   set(ENABLE_TAP OFF)
   if(${NS3_TAP})
     set(ENABLE_TAP ON)