From eb6eddd5d11594ac756bf4fc6b25c0b7944ab0be Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Tue, 27 May 2014 20:49:09 -0500 Subject: [PATCH] Don't link unneeded libraries in commands. --- src/Magnum/Platform/CMakeLists.txt | 3 +-- src/Magnum/Text/CMakeLists.txt | 3 +-- src/Magnum/TextureTools/CMakeLists.txt | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt index 45d77fbd7..e22996b88 100644 --- a/src/Magnum/Platform/CMakeLists.txt +++ b/src/Magnum/Platform/CMakeLists.txt @@ -239,8 +239,7 @@ if(WITH_MAGNUMINFO) elseif(CORRADE_TARGET_WINDOWS) target_link_libraries(magnum-info MagnumWindowlessWglApplication) elseif(APPLE) - find_library(OpenGL_LIBRARY OpenGL) - target_link_libraries(magnum-info MagnumWindowlessCglApplication ${OpenGL_LIBRARY}) + target_link_libraries(magnum-info MagnumWindowlessCglApplication) else() message(FATAL_ERROR "magnum-info is not available on this platform. Set WITH_MAGNUMINFO to OFF to skip building it.") endif() diff --git a/src/Magnum/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt index 131d480fd..d5082cc06 100644 --- a/src/Magnum/Text/CMakeLists.txt +++ b/src/Magnum/Text/CMakeLists.txt @@ -68,8 +68,7 @@ if(WITH_FONTCONVERTER) add_executable(magnum-fontconverter fontconverter.cpp) if(APPLE) - find_library(OpenGL_LIBRARY OpenGL) - target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessCglApplication ${OpenGL_LIBRARY}) + target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessCglApplication) elseif(UNIX AND NOT TARGET_GLES) target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) elseif(WIN32) diff --git a/src/Magnum/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt index d72b98bcb..43ff501c6 100644 --- a/src/Magnum/TextureTools/CMakeLists.txt +++ b/src/Magnum/TextureTools/CMakeLists.txt @@ -57,8 +57,7 @@ if(WITH_DISTANCEFIELDCONVERTER) add_executable(magnum-distancefieldconverter distancefieldconverter.cpp) if(APPLE) - find_library(OpenGL_LIBRARY OpenGL) - target_link_libraries(magnum-distancefieldconverter MagnumTextureTools MagnumWindowlessCglApplication Magnum ${OpenGL_LIBRARIES}) + target_link_libraries(magnum-distancefieldconverter MagnumTextureTools MagnumWindowlessCglApplication Magnum) elseif(UNIX AND NOT TARGET_GLES) target_link_libraries(magnum-distancefieldconverter MagnumTextureTools Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) elseif(WIN32)