Browse Source

Delegate finding of all dependencies to FindMagnum.cmake.

vectorfields
Vladimír Vondruš 15 years ago
parent
commit
30596670ff
  1. 3
      CMakeLists.txt
  2. 2
      modules/FindMagnum.cmake
  3. 3
      src/CMakeLists.txt

3
CMakeLists.txt

@ -3,8 +3,6 @@ project(Magnum)
option(BUILD_TESTS "Build unit tests (requires Qt4)." OFF)
find_package(Corrade REQUIRED)
if(BUILD_TESTS)
find_package(Qt4)
@ -17,6 +15,7 @@ if(BUILD_TESTS)
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Magnum_SOURCE_DIR}/modules/")
find_package(Corrade REQUIRED)
set_parent_scope(MAGNUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
set_parent_scope(MAGNUM_LIBRARY Magnum)

2
modules/FindMagnum.cmake

@ -13,6 +13,8 @@
#
find_package(Corrade REQUIRED)
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
if (MAGNUM_INCLUDE_DIR AND MAGNUM_LIBRARY AND MAGNUM_PRIMITIVES_LIBRARY)

3
src/CMakeLists.txt

@ -2,9 +2,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -std=c++0x")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CORRADE_INCLUDE_DIR})
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
add_subdirectory(Math)
add_subdirectory(Primitives)

Loading…
Cancel
Save