From e49be200d452e55aa8b0e37c1f352e443557743b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 24 Nov 2013 20:02:47 +0100 Subject: [PATCH] Properly fix linking to libdl. Use CORRADE_PLUGINMANAGER_LIBRARIES instead of CORRADE_PLUGINMANAGER_LIBRARY when linking core Magnum library. This reverts commit 80263eb318034e1617e5cf7faddff63f411a0b82 and 6dbe31f0f03856d78b61d7214a3ded49f70010cf. --- src/Audio/Test/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/Text/CMakeLists.txt | 2 +- src/Text/Test/CMakeLists.txt | 4 ++-- src/TextureTools/CMakeLists.txt | 2 +- src/Trade/Test/CMakeLists.txt | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Audio/Test/CMakeLists.txt b/src/Audio/Test/CMakeLists.txt index 796f2aae5..3a42d1f27 100644 --- a/src/Audio/Test/CMakeLists.txt +++ b/src/Audio/Test/CMakeLists.txt @@ -27,7 +27,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake include_directories(${CMAKE_CURRENT_BINARY_DIR}) -corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio ${CORRADE_PLUGINMANAGER_LIBRARIES}) +corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioBufferTest BufferTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioRendererTest RendererTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioSourceTest SourceTest.cpp LIBRARIES MagnumAudio) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 85bc050e9..ff12dfcb8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -180,7 +180,7 @@ if(BUILD_STATIC_PIC) endif() set(Magnum_LIBS ${CORRADE_UTILITY_LIBRARY} - ${CORRADE_PLUGINMANAGER_LIBRARY}) + ${CORRADE_PLUGINMANAGER_LIBRARIES}) if(NOT TARGET_GLES OR TARGET_DESKTOP_GLES) set(Magnum_LIBS ${Magnum_LIBS} ${OPENGL_gl_LIBRARY}) elseif(TARGET_GLES2) diff --git a/src/Text/CMakeLists.txt b/src/Text/CMakeLists.txt index 515d19a79..8f61ce1fe 100644 --- a/src/Text/CMakeLists.txt +++ b/src/Text/CMakeLists.txt @@ -68,7 +68,7 @@ if(WITH_FONTCONVERTER) include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_executable(magnum-fontconverter fontconverter.cpp) - target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${CORRADE_PLUGINMANAGER_LIBRARIES} ${X11_LIBRARIES}) + target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) install(TARGETS magnum-fontconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}) endif() diff --git a/src/Text/Test/CMakeLists.txt b/src/Text/Test/CMakeLists.txt index 073d501e8..e48529eaa 100644 --- a/src/Text/Test/CMakeLists.txt +++ b/src/Text/Test/CMakeLists.txt @@ -27,8 +27,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake include_directories(${CMAKE_CURRENT_BINARY_DIR}) -corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp LIBRARIES Magnum MagnumText ${CORRADE_PLUGINMANAGER_LIBRARIES}) -corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp LIBRARIES Magnum MagnumText ${CORRADE_PLUGINMANAGER_LIBRARIES}) +corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp LIBRARIES Magnum MagnumText) +corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp LIBRARIES Magnum MagnumText) corrade_add_test(TextAbstractLayouterTest AbstractLayouterTest.cpp LIBRARIES Magnum MagnumText) if(BUILD_GL_TESTS) diff --git a/src/TextureTools/CMakeLists.txt b/src/TextureTools/CMakeLists.txt index a61c8c741..05623f9c0 100644 --- a/src/TextureTools/CMakeLists.txt +++ b/src/TextureTools/CMakeLists.txt @@ -57,7 +57,7 @@ if(WITH_DISTANCEFIELDCONVERTER) include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_executable(magnum-distancefieldconverter distancefieldconverter.cpp) - target_link_libraries(magnum-distancefieldconverter MagnumTextureTools Magnum MagnumWindowlessGlxApplication ${CORRADE_PLUGINMANAGER_LIBRARIES} ${X11_LIBRARIES}) + target_link_libraries(magnum-distancefieldconverter MagnumTextureTools Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) install(TARGETS magnum-distancefieldconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}) endif() diff --git a/src/Trade/Test/CMakeLists.txt b/src/Trade/Test/CMakeLists.txt index 5d40b3102..d1a162e92 100644 --- a/src/Trade/Test/CMakeLists.txt +++ b/src/Trade/Test/CMakeLists.txt @@ -27,8 +27,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake include_directories(${CMAKE_CURRENT_BINARY_DIR}) -corrade_add_test(TradeAbstractImageConverterTest AbstractImageConverterTest.cpp LIBRARIES Magnum ${CORRADE_PLUGINMANAGER_LIBRARIES}) -corrade_add_test(TradeAbstractImporterTest AbstractImporterTest.cpp LIBRARIES Magnum ${CORRADE_PLUGINMANAGER_LIBRARIES}) +corrade_add_test(TradeAbstractImageConverterTest AbstractImageConverterTest.cpp LIBRARIES Magnum) +corrade_add_test(TradeAbstractImporterTest AbstractImporterTest.cpp LIBRARIES Magnum) corrade_add_test(TradeAbstractMaterialDataTest AbstractMaterialDataTest.cpp LIBRARIES Magnum) corrade_add_test(TradeImageDataTest ImageDataTest.cpp LIBRARIES Magnum) corrade_add_test(TradeObjectData2DTest ObjectData2DTest.cpp LIBRARIES Magnum)