From d88171aaae6379d37bcd9263a4198c16794a900a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 7 Sep 2012 18:38:17 +0200 Subject: [PATCH] Simplified linking step. --- src/CMakeLists.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4ea37af81..cc35b4470 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,12 +72,18 @@ set_target_properties(MagnumObjects MagnumMathObjects PROPERTIES COMPILE_FLAGS " add_library(Magnum SHARED $ $) -target_link_libraries(Magnum ${CORRADE_UTILITY_LIBRARY} ${CORRADE_PLUGINMANAGER_LIBRARY}) +set(Magnum_LIBS + ${CORRADE_UTILITY_LIBRARY} + ${CORRADE_PLUGINMANAGER_LIBRARY}) if(NOT TARGET_GLES) - target_link_libraries(Magnum ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARY}) + set(Magnum_LIBS ${Magnum_LIBS} + ${OPENGL_gl_LIBRARY} + ${GLEW_LIBRARY}) else() - target_link_libraries(Magnum ${OPENGLES2_LIBRARY}) + set(Magnum_LIBS ${Magnum_LIBS} + ${OPENGLES2_LIBRARY}) endif() +target_link_libraries(Magnum ${Magnum_LIBS}) install(TARGETS Magnum DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) install(FILES ${Magnum_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) @@ -116,12 +122,7 @@ if(BUILD_TESTS) add_library(MagnumTestLib SHARED $) set_target_properties(MagnumTestLib PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT) - target_link_libraries(MagnumTestLib ${CORRADE_UTILITY_LIBRARY} ${CORRADE_PLUGINMANAGER_LIBRARY}) - if(NOT TARGET_GLES) - target_link_libraries(MagnumTestLib ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARY}) - else() - target_link_libraries(MagnumTestLib ${OPENGLES2_LIBRARY}) - endif() + target_link_libraries(MagnumTestLib ${Magnum_LIBS}) add_subdirectory(Test) endif()