From b389f9b6a449900a3ecd8bf75e6ea3943b35f699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 14 Dec 2021 12:50:14 +0100 Subject: [PATCH] Minor cleanup. --- modules/FindMagnum.cmake | 3 +++ src/Magnum/ShaderTools/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 9d2c1a6c9..0d50dffc3 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -452,9 +452,11 @@ if(MAGNUM_TARGET_GL) # GL not required by Primitives themselves, but transitively by MeshTools list(APPEND _MAGNUM_Primitives_DEPENDENCIES GL) endif() + set(_MAGNUM_SceneGraph_DEPENDENCIES ) set(_MAGNUM_SceneTools_DEPENDENCIES Trade) set(_MAGNUM_Shaders_DEPENDENCIES GL) + set(_MAGNUM_Text_DEPENDENCIES TextureTools) if(MAGNUM_TARGET_GL) list(APPEND _MAGNUM_Text_DEPENDENCIES GL) @@ -468,6 +470,7 @@ endif() set(_MAGNUM_Trade_DEPENDENCIES ) set(_MAGNUM_VulkanTester_DEPENDENCIES Vk) set(_MAGNUM_AndroidApplication_DEPENDENCIES GL) + set(_MAGNUM_EmscriptenApplication_DEPENDENCIES) if(MAGNUM_TARGET_GL) list(APPEND _MAGNUM_EmscriptenApplication_DEPENDENCIES GL) diff --git a/src/Magnum/ShaderTools/CMakeLists.txt b/src/Magnum/ShaderTools/CMakeLists.txt index 11c51889b..c0fbc3f49 100644 --- a/src/Magnum/ShaderTools/CMakeLists.txt +++ b/src/Magnum/ShaderTools/CMakeLists.txt @@ -51,8 +51,8 @@ endif() # # Objects shared between main and test library # add_library(MagnumShaderToolsObjects OBJECT # ${MagnumShaderTools_SRCS} -# # ${MagnumShaderTools_HEADERS} -# # ${MagnumShaderTools_PRIVATE_HEADERS}) +# ${MagnumShaderTools_HEADERS} +# ${MagnumShaderTools_PRIVATE_HEADERS}) # target_include_directories(MagnumShaderToolsObjects PUBLIC $) # if(NOT BUILD_STATIC) # target_compile_definitions(MagnumShaderToolsObjects PRIVATE "MagnumShaderToolsObjects_EXPORTS")