From 1e1dc3ebce448b846a339a73c3bae2f6e59da39c Mon Sep 17 00:00:00 2001 From: SirLynix Date: Wed, 27 Jul 2022 18:11:00 +0200 Subject: [PATCH] Build: Don't install private headers --- plugins/Assimp/xmake.lua | 2 +- plugins/FFmpeg/xmake.lua | 2 +- tests/xmake.lua | 2 +- tools/shadernodes.lua | 4 ++-- xmake.lua | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/Assimp/xmake.lua b/plugins/Assimp/xmake.lua index 8912bb129..c88e335dd 100644 --- a/plugins/Assimp/xmake.lua +++ b/plugins/Assimp/xmake.lua @@ -16,7 +16,7 @@ if has_config("assimp") then add_deps("NazaraUtility") add_packages("assimp") - add_headerfiles("**.hpp", "**.inl", { prefixdir = "private" }) + add_headerfiles("**.hpp", "**.inl", { prefixdir = "private", install = false }) add_includedirs(".") add_files("**.cpp") end diff --git a/plugins/FFmpeg/xmake.lua b/plugins/FFmpeg/xmake.lua index da558b9b0..caa75bbd0 100644 --- a/plugins/FFmpeg/xmake.lua +++ b/plugins/FFmpeg/xmake.lua @@ -16,7 +16,7 @@ if has_config("ffmpeg") then add_deps("NazaraUtility") add_packages("ffmpeg") - add_headerfiles("**.hpp", "**.inl", { prefixdir = "private" }) + add_headerfiles("**.hpp", "**.inl", { prefixdir = "private", install = false }) add_includedirs(".") add_files("**.cpp") end diff --git a/tests/xmake.lua b/tests/xmake.lua index 22c76fcb0..d882a6dc1 100644 --- a/tests/xmake.lua +++ b/tests/xmake.lua @@ -19,7 +19,7 @@ if has_config("tests") then add_deps("NazaraAudio", "NazaraCore", "NazaraNetwork", "NazaraPhysics2D") add_packages("catch2", "entt") - add_headerfiles("Engine/**.hpp", { prefixdir = "private" }) + add_headerfiles("Engine/**.hpp", { prefixdir = "private", install = false }) add_files("resources.cpp") add_files("Engine/**.cpp") add_includedirs(".") diff --git a/tools/shadernodes.lua b/tools/shadernodes.lua index f92726ab8..41c72d623 100644 --- a/tools/shadernodes.lua +++ b/tools/shadernodes.lua @@ -116,8 +116,8 @@ if has_config("shadernodes") then end add_includedirs("../src") - add_headerfiles("../src/ShaderNode/**.hpp", "../src/ShaderNode/**.inl") + add_headerfiles("../src/ShaderNode/**.hpp", "../src/ShaderNode/**.inl", { prefixdir = "private", install = false }) add_files("../src/ShaderNode/**.cpp") - add_files("../src/ShaderNode/Previews/PreviewValues.cpp", {unity_ignored = true}) -- fixes an issue with MSVC and operator* + add_files("../src/ShaderNode/Previews/PreviewValues.cpp", { unity_ignored = true }) -- fixes an issue with MSVC and operator* end diff --git a/xmake.lua b/xmake.lua index e452306e0..4aad8d094 100644 --- a/xmake.lua +++ b/xmake.lua @@ -261,7 +261,7 @@ for name, module in pairs(modules) do local headerExts = {".h", ".hpp", ".inl", ".natvis"} for _, ext in ipairs(headerExts) do add_headerfiles("include/(Nazara/" .. name .. "/**" .. ext .. ")") - add_headerfiles("src/Nazara/" .. name .. "/**" .. ext, { prefixdir = "private" }) + add_headerfiles("src/Nazara/" .. name .. "/**" .. ext, { prefixdir = "private", install = false }) end remove_headerfiles("src/Nazara/" .. name .. "/Resources/**.h")