From 99281a1bd1172e6c9914527529ccd1abae5f3b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 12 Apr 2014 00:51:52 +0200 Subject: [PATCH] Cleaned up duplicate stuff in CMakeLists. --- src/Magnum/CMakeLists.txt | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index 5ff0d2030..a9ef0bf8c 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -75,18 +75,6 @@ set(Magnum_SRCS Trade/SceneData.cpp Trade/TextureData.cpp) -# Desktop-only code -if(NOT TARGET_GLES) - set(Magnum_SRCS ${Magnum_SRCS} - BufferTexture.cpp) -endif() - -# Not-ES2 code -if(NOT TARGET_GLES2) - set(Magnum_SRCS ${Magnum_SRCS} - BufferImage.cpp) -endif() - set(Magnum_HEADERS AbstractFramebuffer.h AbstractImage.h @@ -133,21 +121,25 @@ if(BUILD_DEPRECATED) DebugMarker.h) endif() -# Desktop-only headers and libraries +# Desktop-only stuff if(NOT TARGET_GLES) set(Magnum_HEADERS ${Magnum_HEADERS} BufferTexture.h CubeMapTextureArray.h MultisampleTexture.h RectangleTexture.h) - set(Magnum_SRCS ${Magnum_SRCS} $) + set(Magnum_SRCS ${Magnum_SRCS} + BufferTexture.cpp + $) endif() -# Not-ES2 headers +# Non-ES2 stuff if(NOT TARGET_GLES2) set(Magnum_HEADERS ${Magnum_HEADERS} BufferImage.h TextureArray.h) + set(Magnum_SRCS ${Magnum_SRCS} + BufferImage.cpp) endif() # Files shared between main library and math unit test library