Browse Source

CMake subproject support, part 2: export MAGNUM_* variables.

This way the FindMagnum.cmake module will have everything found already
and so it will do only some additional management on top.
pull/126/head
Vladimír Vondruš 11 years ago
parent
commit
9bc98c3f10
  1. 3
      src/CMakeLists.txt
  2. 3
      src/Magnum/Audio/CMakeLists.txt
  3. 4
      src/Magnum/CMakeLists.txt
  4. 3
      src/Magnum/DebugTools/CMakeLists.txt
  5. 3
      src/Magnum/MeshTools/CMakeLists.txt
  6. 42
      src/Magnum/Platform/CMakeLists.txt
  7. 3
      src/Magnum/Primitives/CMakeLists.txt
  8. 3
      src/Magnum/SceneGraph/CMakeLists.txt
  9. 3
      src/Magnum/Shaders/CMakeLists.txt
  10. 3
      src/Magnum/Shapes/CMakeLists.txt
  11. 3
      src/Magnum/Text/CMakeLists.txt
  12. 3
      src/Magnum/TextureTools/CMakeLists.txt
  13. 3
      src/MagnumPlugins/MagnumFont/CMakeLists.txt
  14. 3
      src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt
  15. 3
      src/MagnumPlugins/ObjImporter/CMakeLists.txt
  16. 3
      src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
  17. 3
      src/MagnumPlugins/TgaImporter/CMakeLists.txt
  18. 3
      src/MagnumPlugins/WavAudioImporter/CMakeLists.txt

3
src/CMakeLists.txt

@ -52,3 +52,6 @@ include_directories(${PROJECT_SOURCE_DIR}/src/MagnumExternal/OpenGL)
add_subdirectory(MagnumExternal) add_subdirectory(MagnumExternal)
add_subdirectory(Magnum) add_subdirectory(Magnum)
add_subdirectory(MagnumPlugins) add_subdirectory(MagnumPlugins)
# Magnum include dir for superprojects
set(MAGNUM_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")

3
src/Magnum/Audio/CMakeLists.txt

@ -80,3 +80,6 @@ install(FILES ${MagnumAudio_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/A
if(BUILD_TESTS) if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum Audio library for superprojects
set(MAGNUM_AUDIO_LIBRARY MagnumAudio CACHE INTERNAL "")

4
src/Magnum/CMakeLists.txt

@ -327,3 +327,7 @@ if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum library and configure file for superprojects
set(MAGNUM_LIBRARY Magnum CACHE INTERNAL "")
set(_MAGNUM_CONFIGURE_FILE ${CMAKE_CURRENT_BINARY_DIR}/configure.h CACHE INTERNAL "")

3
src/Magnum/DebugTools/CMakeLists.txt

@ -93,3 +93,6 @@ install(FILES ${MagnumDebugTools_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_D
if(BUILD_TESTS) if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum DebugTools library for superprojects
set(MAGNUM_DEBUGTOOLS_LIBRARY MagnumDebugTools CACHE INTERNAL "")

3
src/Magnum/MeshTools/CMakeLists.txt

@ -105,3 +105,6 @@ if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum MeshTools library for superprojects
set(MAGNUM_MESHTOOLS_LIBRARY MagnumMeshTools CACHE INTERNAL "")

42
src/Magnum/Platform/CMakeLists.txt

@ -86,6 +86,9 @@ if(WITH_ANDROIDAPPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum AndroidApplication library for superprojects
set(MAGNUM_ANDROIDAPPLICATION_LIBRARY MagnumAndroidApplication CACHE INTERNAL "")
endif() endif()
# GLUT application # GLUT application
@ -112,6 +115,9 @@ if(WITH_GLUTAPPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum GlutApplication library for superprojects
set(MAGNUM_GLUTAPPLICATION_LIBRARY MagnumGlutApplication CACHE INTERNAL "")
endif() endif()
# SDL2 application # SDL2 application
@ -140,6 +146,9 @@ if(WITH_SDL2APPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum Sdl2Application library for superprojects
set(MAGNUM_SDL2APPLICATION_LIBRARY MagnumSdl2Application CACHE INTERNAL "")
endif() endif()
# NaCl application # NaCl application
@ -187,6 +196,9 @@ if(WITH_WINDOWLESSNACLAPPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum WindowlessNaClApplication library for superprojects
set(MAGNUM_WINDOWLESSNACLAPPLICATION_LIBRARY MagnumWindowlessNaClApplication CACHE INTERNAL "")
endif() endif()
# JavaScript and CSS stuff for NaCl # JavaScript and CSS stuff for NaCl
@ -232,6 +244,9 @@ if(WITH_GLXAPPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum GlxApplication library for superprojects
set(MAGNUM_GLXAPPLICATION_LIBRARY MagnumGlxApplication CACHE INTERNAL "")
endif() endif()
# X/EGL application # X/EGL application
@ -259,6 +274,9 @@ if(WITH_XEGLAPPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum XEglApplication library for superprojects
set(MAGNUM_XEGLAPPLICATION_LIBRARY MagnumXEglApplication CACHE INTERNAL "")
endif() endif()
if(WITH_WINDOWLESSGLXAPPLICATION OR NEED_ABSTRACTXAPPLICATION) if(WITH_WINDOWLESSGLXAPPLICATION OR NEED_ABSTRACTXAPPLICATION)
@ -293,6 +311,9 @@ if(WITH_WINDOWLESSGLXAPPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum WindowlessGlxApplication library for superprojects
set(MAGNUM_WINDOWLESSGLXAPPLICATION_LIBRARY MagnumWindowlessGlxApplication CACHE INTERNAL "")
endif() endif()
# Windowless WGL application # Windowless WGL application
@ -319,6 +340,9 @@ if(WITH_WINDOWLESSWGLAPPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum WindowlessWglApplication library for superprojects
set(MAGNUM_WINDOWLESSWGLAPPLICATION_LIBRARY MagnumWindowlessWglApplication CACHE INTERNAL "")
endif() endif()
# Windowless Windows/EGL application # Windowless Windows/EGL application
@ -350,6 +374,9 @@ if(WITH_WINDOWLESSWINDOWSEGLAPPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum WindowlessWindowsEglApplication library for superprojects
set(MAGNUM_WINDOWLESSWINDOWSEGLAPPLICATION_LIBRARY MagnumWindowlessWindowsEglApplication CACHE INTERNAL "")
endif() endif()
# Windowless CGL application # Windowless CGL application
@ -374,6 +401,9 @@ if(WITH_WINDOWLESSCGLAPPLICATION)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum WindowlessCglApplication library for superprojects
set(MAGNUM_WINDOWLESSCGLAPPLICATION_LIBRARY MagnumWindowlessCglApplication CACHE INTERNAL "")
endif() endif()
# Abstract X application # Abstract X application
@ -469,6 +499,9 @@ if(NEED_CGLCONTEXT OR WITH_CGLCONTEXT)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum CglContext library for superprojects
set(MAGNUM_CGLCONTEXT_LIBRARY MagnumCglContext CACHE INTERNAL "")
endif() endif()
endif() endif()
@ -499,6 +532,9 @@ if(NEED_EGLCONTEXT OR WITH_EGLCONTEXT)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum EglContext library for superprojects
set(MAGNUM_EGLCONTEXT_LIBRARY MagnumEglContext CACHE INTERNAL "")
endif() endif()
endif() endif()
@ -522,6 +558,9 @@ if(NEED_GLXCONTEXT OR WITH_GLXCONTEXT)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum GlxContext library for superprojects
set(MAGNUM_GLXCONTEXT_LIBRARY MagnumGlxContext CACHE INTERNAL "")
endif() endif()
endif() endif()
@ -544,6 +583,9 @@ if(NEED_WGLCONTEXT OR WITH_WGLCONTEXT)
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR} RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
# Magnum WglContext library for superprojects
set(MAGNUM_WGLCONTEXT_LIBRARY MagnumWglContext CACHE INTERNAL "")
endif() endif()
endif() endif()

3
src/Magnum/Primitives/CMakeLists.txt

@ -78,3 +78,6 @@ install(FILES ${MagnumPrimitives_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_D
if(BUILD_TESTS) if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum Primitives library for superprojects
set(MAGNUM_PRIMITIVES_LIBRARY MagnumPrimitives CACHE INTERNAL "")

3
src/Magnum/SceneGraph/CMakeLists.txt

@ -124,3 +124,6 @@ if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum SceneGraph library for superprojects
set(MAGNUM_SCENEGRAPH_LIBRARY MagnumSceneGraph CACHE INTERNAL "")

3
src/Magnum/Shaders/CMakeLists.txt

@ -73,3 +73,6 @@ install(FILES ${MagnumShaders_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}
if(BUILD_TESTS) if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum Shaders library for superprojects
set(MAGNUM_SHADERS_LIBRARY MagnumShaders CACHE INTERNAL "")

3
src/Magnum/Shapes/CMakeLists.txt

@ -85,3 +85,6 @@ install(FILES ${MagnumShapes_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/
if(BUILD_TESTS) if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum Shapes library for superprojects
set(MAGNUM_SHAPES_LIBRARY MagnumShapes CACHE INTERNAL "")

3
src/Magnum/Text/CMakeLists.txt

@ -81,3 +81,6 @@ endif()
if(BUILD_TESTS) if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum Text library for superprojects
set(MAGNUM_TEXT_LIBRARY MagnumText CACHE INTERNAL "")

3
src/Magnum/TextureTools/CMakeLists.txt

@ -77,3 +77,6 @@ install(FILES ${MagnumTextureTools_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL
if(BUILD_TESTS) if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum TextureTools library for superprojects
set(MAGNUM_TEXTURETOOLS_LIBRARY MagnumTextureTools CACHE INTERNAL "")

3
src/MagnumPlugins/MagnumFont/CMakeLists.txt

@ -70,3 +70,6 @@ if(BUILD_GL_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum MagnumFont library for superprojects
set(MAGNUM_MAGNUMFONT_LIBRARY MagnumFont CACHE INTERNAL "")

3
src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt

@ -70,3 +70,6 @@ if(BUILD_GL_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum MagnumFontConverter library for superprojects
set(MAGNUM_MAGNUMFONTCONVERTER_LIBRARY MagnumFontConverter CACHE INTERNAL "")

3
src/MagnumPlugins/ObjImporter/CMakeLists.txt

@ -55,3 +55,6 @@ if(BUILD_TESTS)
target_link_libraries(MagnumObjImporterTestLib Magnum MagnumMeshTools) target_link_libraries(MagnumObjImporterTestLib Magnum MagnumMeshTools)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum ObjImporter library for superprojects
set(MAGNUM_OBJIMPORTER_LIBRARY ObjImporter CACHE INTERNAL "")

3
src/MagnumPlugins/TgaImageConverter/CMakeLists.txt

@ -67,3 +67,6 @@ if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum TgaImageConverter library for superprojects
set(MAGNUM_TGAIMAGECONVERTER_LIBRARY TgaImageConverter CACHE INTERNAL "")

3
src/MagnumPlugins/TgaImporter/CMakeLists.txt

@ -68,3 +68,6 @@ if(BUILD_TESTS)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum TgaImporter library for superprojects
set(MAGNUM_TGAIMPORTER_LIBRARY TgaImporter CACHE INTERNAL "")

3
src/MagnumPlugins/WavAudioImporter/CMakeLists.txt

@ -60,3 +60,6 @@ if(BUILD_TESTS)
target_link_libraries(MagnumWavAudioImporterTestLib Magnum MagnumAudio) target_link_libraries(MagnumWavAudioImporterTestLib Magnum MagnumAudio)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()
# Magnum WavAudioImporter library for superprojects
set(MAGNUM_WAVAUDIOIMPORTER_LIBRARY WavAudioImporter CACHE INTERNAL "")

Loading…
Cancel
Save