From ac5bd38df9522da88932725e62d9859720f8fc75 Mon Sep 17 00:00:00 2001 From: scrawl Date: Mon, 23 Jul 2012 14:59:57 +0200 Subject: [PATCH] some cmake fixes --- CMakeLists.txt | 6 +----- extern/shiny | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0b5bf451..f124f1383 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,14 +189,10 @@ endif() set(BOOST_COMPONENTS system filesystem program_options thread) if (Boost_VERSION LESS 104900) - set(SHINY_USE_WAVE_SYSTEM_INSTALL TRUE) + set(SHINY_USE_WAVE_SYSTEM_INSTALL "TRUE") set(BOOST_COMPONENTS ${BOOST_COMPONENTS} wave) -else() - set(SHINY_USE_WAVE_SYSTEM_INSTALL FALSE) endif() -MESSAGE(STATUS ${BOOST_COMPONENTS}) - find_package(OGRE REQUIRED) find_package(MyGUI REQUIRED) find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS}) diff --git a/extern/shiny b/extern/shiny index 41245d136..73ddc737c 160000 --- a/extern/shiny +++ b/extern/shiny @@ -1 +1 @@ -Subproject commit 41245d1361bc0242e5d2c2313caffb711207e5fc +Subproject commit 73ddc737ce6334b264649fd4b0a16109fd8b8a99