From 105fcc5e20535c7a313591fc5caa0f2ee735c52c Mon Sep 17 00:00:00 2001 From: scrawl Date: Mon, 10 Oct 2016 15:59:59 +0200 Subject: [PATCH] Move the setting of BOOST_COMPONENTS closer to where it's actually used --- CMakeLists.txt | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f60b80e8c..939c273104 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,15 +211,6 @@ if(NOT HAVE_STDINT_H) endif() -set(BOOST_COMPONENTS system filesystem program_options thread) -if(WIN32) - set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale) -endif(WIN32) - -IF(BOOST_STATIC) - set(Boost_USE_STATIC_LIBS ON) -endif() - find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX) include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}) @@ -253,8 +244,18 @@ if(QT_STATIC) endif() endif() -find_package(MyGUI 3.2.1 REQUIRED) + +set(BOOST_COMPONENTS system filesystem program_options) +if(WIN32) + set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale) +endif(WIN32) + +IF(BOOST_STATIC) + set(Boost_USE_STATIC_LIBS ON) +endif() + find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS}) +find_package(MyGUI 3.2.1 REQUIRED) find_package(SDL2 REQUIRED) find_package(OpenAL REQUIRED) find_package(Bullet 283 REQUIRED COMPONENTS BulletCollision LinearMath)