From a1aaa2808f726f538f0b2d752766ada4b062d2e6 Mon Sep 17 00:00:00 2001
From: Erik Boasson <eb@ilities.com>
Date: Wed, 6 Nov 2019 11:23:49 +0100
Subject: [PATCH] Check once for system-independent headers (#270)

Signed-off-by: Erik Boasson <eb@ilities.com>
---
 src/ddsrt/CMakeLists.txt | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/ddsrt/CMakeLists.txt b/src/ddsrt/CMakeLists.txt
index 19b99df..b750b0c 100644
--- a/src/ddsrt/CMakeLists.txt
+++ b/src/ddsrt/CMakeLists.txt
@@ -183,6 +183,19 @@ foreach(feature atomics cdtors environ heap ifaddrs random rusage
       endif()
       set(system_exists FALSE)
 
+      # Headers that must remain private but are required by other runtime
+      # source files must be located in src/<feature>/dds/ddsrt.
+      if(IS_DIRECTORY "${source_path}/${feature}/include")
+        file(GLOB_RECURSE
+               files
+             CONFIGURE_DEPENDS
+               "${source_path}/${feature}/include/*.h")
+        list(APPEND headers ${files})
+        target_include_directories(
+          ddsrt INTERFACE
+            "$<BUILD_INTERFACE:${source_path}/${feature}/include/>")
+      endif()
+
       # Allow custom implementations for a feature. e.g. lwip as opposed to
       # windows or posix.
       set(_system_name "${system_name}")
@@ -191,18 +204,6 @@ foreach(feature atomics cdtors environ heap ifaddrs random rusage
       endif()
 
       foreach(system ${_system_name} posix)
-        # Headers that must remain private but are required by other runtime
-        # source files must be located in src/<feature>/dds/ddsrt.
-        if(IS_DIRECTORY "${source_path}/${feature}/include")
-          file(GLOB_RECURSE
-                 files
-               CONFIGURE_DEPENDS
-                 "${source_path}/${feature}/include/*.h")
-          list(APPEND headers ${files})
-          target_include_directories(
-            ddsrt INTERFACE
-              "$<BUILD_INTERFACE:${source_path}/${feature}/include/>")
-        endif()
         if(IS_DIRECTORY "${source_path}/${feature}/${system}")
           file(GLOB_RECURSE
                  files