add subscription sources dynamically in cmake. remove some ifdefs

CMakeLists.txt

@@ -99,9 +99,6 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_attribute.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_nodemanagement.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_view.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_subscription.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_subscription.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_subscription_manager.c
                 ${PROJECT_SOURCE_DIR}/src/client/ua_client.c
                 ${PROJECT_SOURCE_DIR}/examples/networklayer_tcp.c 
                 ${PROJECT_SOURCE_DIR}/examples/logger_stdout.c)
@@ -112,6 +109,11 @@ file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/src_generated")
 
 # As requested by @sten: separate generation of headers for subscriptions from pico-server
 if(ENABLE_SUBSCRIPTIONS)
+
+  list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_services_subscription.c
+                          ${PROJECT_SOURCE_DIR}/src/server/ua_subscription.c
+                          ${PROJECT_SOURCE_DIR}/src/server/ua_subscription_manager.c)
+
 add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/ua_types_generated.c
                           ${PROJECT_BINARY_DIR}/src_generated/ua_types_generated.h
                    PRE_BUILD

src/server/ua_services_subscription.c

@@ -1,4 +1,3 @@
-#ifdef ENABLE_SUBSCRIPTIONS
 #include "ua_services.h"
 #include "ua_server_internal.h"
 #include "ua_subscription_manager.h"
@@ -245,4 +244,3 @@ void Service_DeleteMonitoredItems(UA_Server *server, UA_Session *session,
         resultCodes[i] = SubscriptionManager_deleteMonitoredItem(manager, sub->SubscriptionID, (request->monitoredItemIds)[i]);
     }
 }
-#endif //#ifdef ENABLE_SUBSCRIPTIONS

src/server/ua_subscription.c

@@ -1,8 +1,7 @@
-#ifdef ENABLE_SUBSCRIPTIONS
-
 #include "ua_subscription.h"
 #include "ua_server_internal.h"
 #include "ua_nodestore.h"
+
 /****************/
 /* Subscription */
 /****************/
@@ -223,7 +222,6 @@ UA_UInt32 Subscription_deleteUnpublishedNotification(UA_UInt32 seqNo, UA_Subscri
     return deletedItems;
 }
 
-
 /*****************/
 /* MonitoredItem */
 /*****************/
@@ -487,5 +485,3 @@ void MonitoredItem_QueuePushDataValue(UA_Server *server, UA_MonitoredItem *monit
   
   return;
 }
-
-#endif

src/server/ua_subscription.h

@@ -1,4 +1,3 @@
-#ifdef  ENABLE_SUBSCRIPTIONS
 #ifndef UA_SUBSCRIPTION_H_
 #define UA_SUBSCRIPTION_H_
 
@@ -7,7 +6,6 @@
 #include "ua_types_generated.h"
 #include "ua_nodes.h"
 
-
 #define LIST_INITENTRY(item,entry) \
   (item)->entry.le_next = NULL; \
   (item)->entry.le_prev = NULL;
@@ -108,4 +106,3 @@ UA_UInt32 Subscription_deleteUnpublishedNotification(UA_UInt32 seqNo, UA_Subscri
 void Subscription_generateKeepAlive(UA_Subscription *subscription);
 
 #endif //UA_SUBSCRIPTION_H_
-#endif //ENABLE_SUBSCRIPTIONS

src/server/ua_subscription_manager.c

@@ -1,4 +1,3 @@
-#ifdef ENABLE_SUBSCRIPTIONS
 #include "ua_types.h"
 #include "ua_server_internal.h"
 #include "ua_nodestore.h"
@@ -94,5 +93,3 @@ UA_Int32 SubscriptionManager_deleteSubscription(UA_SubscriptionManager *manager,
     UA_free(sub);
     return UA_STATUSCODE_GOOD;
 } 
-
-#endif //#ifdef ENABLE_SUBSCRIPTIONS

src/server/ua_subscription_manager.h

@@ -1,4 +1,3 @@
-#ifdef  ENABLE_SUBSCRIPTIONS
 #ifndef UA_SUBSCRIPTION_MANAGER_H_
 #define UA_SUBSCRIPTION_MANAGER_H_
 
@@ -30,4 +29,3 @@ UA_Int32 SubscriptionManager_deleteMonitoredItem(UA_SubscriptionManager *manager
                                                  UA_UInt32 MonitoredItemID);
 
 #endif  // ifndef... define UA_SUBSCRIPTION_MANAGER_H_
-#endif  // ifdef EnableSubscriptions ...