From e6ce6fea5cbc8ff9db42ab51c0ffb4d4274391db Mon Sep 17 00:00:00 2001
From: thomasl <thomasl@eurecom.fr>
Date: Mon, 2 Mar 2015 16:33:26 +0000
Subject: [PATCH] added conditional compilation for new cmake based build in
 this version, the asn.1 generated files are in directory that depend on 3GGP
 version instead of the (complex) .lock files management

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6644 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
 openair2/COMMON/platform_constants.h | 4 ++++
 openair2/COMMON/rrc_messages_types.h | 4 ++++
 openair2/ENB_APP/enb_config.c        | 1 -
 openair2/ENB_APP/enb_config.h        | 4 ++++
 openair2/UTIL/LOG/log.h              | 3 +++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/openair2/COMMON/platform_constants.h b/openair2/COMMON/platform_constants.h
index 922b72c52b..056c8866af 100755
--- a/openair2/COMMON/platform_constants.h
+++ b/openair2/COMMON/platform_constants.h
@@ -36,7 +36,11 @@
 
  ***************************************************************************/
 
+#ifdef CMAKER
+#include "asn1_constants.h"
+#else
 #include "RRC/LITE/MESSAGES/asn1_constants.h"
+#endif
 
 #ifndef __PLATFORM_CONSTANTS_H__
 #    define __PLATFORM_CONSTANTS_H__
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 7a9b3cf872..2c8ce1cf32 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -40,7 +40,11 @@
 #include "as_message.h"
 #include "rrc_types.h"
 #include "s1ap_messages_types.h"
+#ifdef CMAKER
+#include "SystemInformationBlockType2.h"
+#else
 #include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h"
+#endif
 
 //-------------------------------------------------------------------------------------------//
 // Messages for RRC logging
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 5a3bb9b170..f3b1bce7b2 100755
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -56,7 +56,6 @@
 #   include "sctp_eNB_task.h"
 # endif
 #endif
-#include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h"
 #include "LAYER2/MAC/extern.h"
 
 #define ENB_CONFIG_STRING_ACTIVE_ENBS                   "Active_eNBs"
diff --git a/openair2/ENB_APP/enb_config.h b/openair2/ENB_APP/enb_config.h
index 9cfb905521..9981be066e 100755
--- a/openair2/ENB_APP/enb_config.h
+++ b/openair2/ENB_APP/enb_config.h
@@ -46,7 +46,11 @@
 #include "platform_constants.h"
 #include "PHY/impl_defs_lte.h"
 #include "s1ap_messages_types.h"
+#ifdef CMAKER
+#include "SystemInformationBlockType2.h"
+#else
 #include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h"
+#endif
 
 // Hard to find a defined value for max enb...
 #define MAX_ENB 16
diff --git a/openair2/UTIL/LOG/log.h b/openair2/UTIL/LOG/log.h
index b5517c5b33..e3b549f962 100755
--- a/openair2/UTIL/LOG/log.h
+++ b/openair2/UTIL/LOG/log.h
@@ -55,6 +55,9 @@
 #include "rtai_fifos.h"
 #endif
 
+#ifdef CMAKER
+#include <ConfigOAI.h>
+#endif
 /*----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
-- 
GitLab