ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Don't link unneeded libraries in commands.

pull/60/head
Travis Watkins 12 years ago
parent
7ea1996566
commit
eb6eddd5d1
3 changed files with 3 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/Magnum/Platform/CMakeLists.txt
  2. 3
      src/Magnum/Text/CMakeLists.txt
  3. 3
      src/Magnum/TextureTools/CMakeLists.txt

3
src/Magnum/Platform/CMakeLists.txt
Unescape View File

@ -239,8 +239,7 @@ if(WITH_MAGNUMINFO)
elseif(CORRADE_TARGET_WINDOWS) elseif(CORRADE_TARGET_WINDOWS)
target_link_libraries(magnum-info MagnumWindowlessWglApplication) target_link_libraries(magnum-info MagnumWindowlessWglApplication)
elseif(APPLE) elseif(APPLE)
find_library(OpenGL_LIBRARY OpenGL) target_link_libraries(magnum-info MagnumWindowlessCglApplication)
target_link_libraries(magnum-info MagnumWindowlessCglApplication ${OpenGL_LIBRARY})
else() else()
message(FATAL_ERROR "magnum-info is not available on this platform. Set WITH_MAGNUMINFO to OFF to skip building it.") message(FATAL_ERROR "magnum-info is not available on this platform. Set WITH_MAGNUMINFO to OFF to skip building it.")
endif() endif()

3
src/Magnum/Text/CMakeLists.txt
Unescape View File

@ -68,8 +68,7 @@ if(WITH_FONTCONVERTER)
add_executable(magnum-fontconverter fontconverter.cpp) add_executable(magnum-fontconverter fontconverter.cpp)
if(APPLE) if(APPLE)
find_library(OpenGL_LIBRARY OpenGL) target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessCglApplication)
target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessCglApplication ${OpenGL_LIBRARY})
elseif(UNIX AND NOT TARGET_GLES) elseif(UNIX AND NOT TARGET_GLES)
target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES})
elseif(WIN32) elseif(WIN32)

3
src/Magnum/TextureTools/CMakeLists.txt
Unescape View File

@ -57,8 +57,7 @@ if(WITH_DISTANCEFIELDCONVERTER)
add_executable(magnum-distancefieldconverter distancefieldconverter.cpp) add_executable(magnum-distancefieldconverter distancefieldconverter.cpp)
if(APPLE) if(APPLE)
find_library(OpenGL_LIBRARY OpenGL) target_link_libraries(magnum-distancefieldconverter MagnumTextureTools MagnumWindowlessCglApplication Magnum)
target_link_libraries(magnum-distancefieldconverter MagnumTextureTools MagnumWindowlessCglApplication Magnum ${OpenGL_LIBRARIES})
elseif(UNIX AND NOT TARGET_GLES) elseif(UNIX AND NOT TARGET_GLES)
target_link_libraries(magnum-distancefieldconverter MagnumTextureTools Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) target_link_libraries(magnum-distancefieldconverter MagnumTextureTools Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES})
elseif(WIN32) elseif(WIN32)

Write Preview
Loading…
Cancel
Save