From 1f14195543a83506a7f03db619b1b1c98fe246e2 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Fri, 7 Jul 2023 13:47:05 +0200
Subject: [PATCH] Move inclusion of openair2/E2AP where it belongs

---
 CMakeLists.txt          | 6 ------
 openair2/CMakeLists.txt | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c495fb52cc..05ebd0b10c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,15 +331,9 @@ add_definitions(-DHAVE_NETINET_IN_H)
 #########################
 ##### E2 AGENT
 #########################
-#add_boolean_option() does not work -- why?
 set(E2_AGENT "OFF" CACHE STRING "O-RAN-compliant E2 Agent")
 set_property(CACHE E2_AGENT PROPERTY STRINGS "ON" "OFF")
 
-if(E2_AGENT)
-  set(E2AP_DIR ${OPENAIR2_DIR}/E2AP)
-  add_subdirectory ("${E2AP_DIR}")
-endif()
-
 ##################################################
 # ASN.1 grammar C code generation & dependencies #
 ##################################################
diff --git a/openair2/CMakeLists.txt b/openair2/CMakeLists.txt
index 563d343420..117d18412b 100644
--- a/openair2/CMakeLists.txt
+++ b/openair2/CMakeLists.txt
@@ -1,4 +1,7 @@
 add_subdirectory(E1AP)
+if(E2_AGENT)
+  add_subdirectory(E2AP)
+endif()
 add_subdirectory(F1AP)
 add_subdirectory(M2AP)
 add_subdirectory(X2AP)