From 30596670ffe9a623db4e28ff37eb0c8c0395b842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 9 Dec 2011 17:17:07 +0100 Subject: [PATCH] Delegate finding of all dependencies to FindMagnum.cmake. --- CMakeLists.txt | 3 +-- modules/FindMagnum.cmake | 2 ++ src/CMakeLists.txt | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3151a47f6..454678b02 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index ce8f2ae79..e1e4a14c1 100644 --- a/modules/FindMagnum.cmake +++ b/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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1da2a18e..971e64c5e 100644 --- a/src/CMakeLists.txt +++ b/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)