From 232f112beae716b4b3977b95015a59c1dcc6e270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 12 Sep 2013 19:08:46 +0200 Subject: [PATCH] Fixed compilation on OpenGL ES. Forgot that glLoadGen is useless there. --- src/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8150ae76a..a8ddc6a07 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -84,6 +84,7 @@ set(Magnum_SRCS Trade/PhongMaterialData.cpp Trade/SceneData.cpp Trade/TextureData.cpp) +set(Magnum_OBJECTS $) # Desktop-only code if(NOT TARGET_GLES) @@ -147,6 +148,7 @@ endif() if(NOT TARGET_GLES2) set(Magnum_HEADERS ${Magnum_HEADERS} BufferImage.h) + set(Magnum_OBJECTS ${Magnum_OBJECTS} $) endif() # Files shared between main library and math unit test library @@ -164,9 +166,8 @@ set_target_properties(MagnumObjects PROPERTIES COMPILE_FLAGS "-DMagnumObjects_EX # Main library add_library(Magnum ${SHARED_OR_STATIC} - $ - $ - $) + ${Magnum_OBJECTS} + $) if(BUILD_STATIC_PIC) # TODO: CMake 2.8.9 has this as POSITION_INDEPENDENT_CODE property set_target_properties(Magnum PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") @@ -235,9 +236,8 @@ if(BUILD_TESTS) target_link_libraries(MagnumMathTestLib ${CORRADE_UTILITY_LIBRARY}) add_library(MagnumTestLib ${SHARED_OR_STATIC} - $ - $ - $) + ${Magnum_OBJECTS} + $) set_target_properties(MagnumTestLib PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT) target_link_libraries(MagnumTestLib ${Magnum_LIBS})