Browse Source

Minor cleanup.

pull/542/merge
Vladimír Vondruš 4 years ago
parent
commit
b389f9b6a4
  1. 3
      modules/FindMagnum.cmake
  2. 4
      src/Magnum/ShaderTools/CMakeLists.txt

3
modules/FindMagnum.cmake

@ -452,9 +452,11 @@ if(MAGNUM_TARGET_GL)
# GL not required by Primitives themselves, but transitively by MeshTools # GL not required by Primitives themselves, but transitively by MeshTools
list(APPEND _MAGNUM_Primitives_DEPENDENCIES GL) list(APPEND _MAGNUM_Primitives_DEPENDENCIES GL)
endif() endif()
set(_MAGNUM_SceneGraph_DEPENDENCIES ) set(_MAGNUM_SceneGraph_DEPENDENCIES )
set(_MAGNUM_SceneTools_DEPENDENCIES Trade) set(_MAGNUM_SceneTools_DEPENDENCIES Trade)
set(_MAGNUM_Shaders_DEPENDENCIES GL) set(_MAGNUM_Shaders_DEPENDENCIES GL)
set(_MAGNUM_Text_DEPENDENCIES TextureTools) set(_MAGNUM_Text_DEPENDENCIES TextureTools)
if(MAGNUM_TARGET_GL) if(MAGNUM_TARGET_GL)
list(APPEND _MAGNUM_Text_DEPENDENCIES GL) list(APPEND _MAGNUM_Text_DEPENDENCIES GL)
@ -468,6 +470,7 @@ endif()
set(_MAGNUM_Trade_DEPENDENCIES ) set(_MAGNUM_Trade_DEPENDENCIES )
set(_MAGNUM_VulkanTester_DEPENDENCIES Vk) set(_MAGNUM_VulkanTester_DEPENDENCIES Vk)
set(_MAGNUM_AndroidApplication_DEPENDENCIES GL) set(_MAGNUM_AndroidApplication_DEPENDENCIES GL)
set(_MAGNUM_EmscriptenApplication_DEPENDENCIES) set(_MAGNUM_EmscriptenApplication_DEPENDENCIES)
if(MAGNUM_TARGET_GL) if(MAGNUM_TARGET_GL)
list(APPEND _MAGNUM_EmscriptenApplication_DEPENDENCIES GL) list(APPEND _MAGNUM_EmscriptenApplication_DEPENDENCIES GL)

4
src/Magnum/ShaderTools/CMakeLists.txt

@ -51,8 +51,8 @@ endif()
# # Objects shared between main and test library # # Objects shared between main and test library
# add_library(MagnumShaderToolsObjects OBJECT # add_library(MagnumShaderToolsObjects OBJECT
# ${MagnumShaderTools_SRCS} # ${MagnumShaderTools_SRCS}
# # ${MagnumShaderTools_HEADERS} # ${MagnumShaderTools_HEADERS}
# # ${MagnumShaderTools_PRIVATE_HEADERS}) # ${MagnumShaderTools_PRIVATE_HEADERS})
# target_include_directories(MagnumShaderToolsObjects PUBLIC $<TARGET_PROPERTY:Magnum,INTERFACE_INCLUDE_DIRECTORIES>) # target_include_directories(MagnumShaderToolsObjects PUBLIC $<TARGET_PROPERTY:Magnum,INTERFACE_INCLUDE_DIRECTORIES>)
# if(NOT BUILD_STATIC) # if(NOT BUILD_STATIC)
# target_compile_definitions(MagnumShaderToolsObjects PRIVATE "MagnumShaderToolsObjects_EXPORTS") # target_compile_definitions(MagnumShaderToolsObjects PRIVATE "MagnumShaderToolsObjects_EXPORTS")

Loading…
Cancel
Save