From 70f3993a55ecbd6ca1b0ebec0128bf0feb0894f3 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Thu, 4 Mar 2021 18:50:29 +0000
Subject: [PATCH] CMake: Fix host strgen/settingsgen importing

---
 src/lang/CMakeLists.txt        | 1 -
 src/settingsgen/CMakeLists.txt | 2 +-
 src/strgen/CMakeLists.txt      | 2 +-
 src/table/CMakeLists.txt       | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lang/CMakeLists.txt b/src/lang/CMakeLists.txt
index db63c003e2..3041ef27d2 100644
--- a/src/lang/CMakeLists.txt
+++ b/src/lang/CMakeLists.txt
@@ -65,7 +65,6 @@ set(LANG_BINARY_DIR ${CMAKE_BINARY_DIR}/lang)
 
 if (HOST_BINARY_DIR)
     include(${HOST_BINARY_DIR}/strgen.cmake)
-    add_executable(hoststrgen ALIAS strgen)
 endif()
 
 # Walk over all the (finished) language files, and generate a command to compile them
diff --git a/src/settingsgen/CMakeLists.txt b/src/settingsgen/CMakeLists.txt
index 43d5284e62..d5c491dcd6 100644
--- a/src/settingsgen/CMakeLists.txt
+++ b/src/settingsgen/CMakeLists.txt
@@ -13,6 +13,6 @@ if (NOT HOST_BINARY_DIR)
     add_definitions(-DSETTINGSGEN)
     add_executable(settingsgen ${sourcefiles})
 
-    export(TARGETS settingsgen FILE ${CMAKE_BINARY_DIR}/settingsgen.cmake)
+    export(TARGETS settingsgen NAMESPACE host FILE ${CMAKE_BINARY_DIR}/settingsgen.cmake)
     add_dependencies(tools settingsgen)
 endif()
diff --git a/src/strgen/CMakeLists.txt b/src/strgen/CMakeLists.txt
index 490f675f2e..4bc53626a0 100644
--- a/src/strgen/CMakeLists.txt
+++ b/src/strgen/CMakeLists.txt
@@ -18,7 +18,7 @@ if (NOT HOST_BINARY_DIR)
     include(Endian)
     add_endian_definition()
 
-    export(TARGETS strgen FILE ${CMAKE_BINARY_DIR}/strgen.cmake)
+    export(TARGETS strgen NAMESPACE host FILE ${CMAKE_BINARY_DIR}/strgen.cmake)
     add_dependencies(tools strgen)
 endif()
 
diff --git a/src/table/CMakeLists.txt b/src/table/CMakeLists.txt
index fc87a97f77..d2e1e50fa7 100644
--- a/src/table/CMakeLists.txt
+++ b/src/table/CMakeLists.txt
@@ -13,7 +13,6 @@ set(TABLE_INI_SOURCE_FILES
 
 if (HOST_BINARY_DIR)
     include(${HOST_BINARY_DIR}/settingsgen.cmake)
-    add_executable(hostsettingsgen ALIAS settingsgen)
 endif()
 
 # Generate a command and target to create the settings table