some cmake fixes

actorid
scrawl 13 years ago
parent 2eca27bba9
commit ac5bd38df9

@ -189,14 +189,10 @@ endif()
set(BOOST_COMPONENTS system filesystem program_options thread) set(BOOST_COMPONENTS system filesystem program_options thread)
if (Boost_VERSION LESS 104900) 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) set(BOOST_COMPONENTS ${BOOST_COMPONENTS} wave)
else()
set(SHINY_USE_WAVE_SYSTEM_INSTALL FALSE)
endif() endif()
MESSAGE(STATUS ${BOOST_COMPONENTS})
find_package(OGRE REQUIRED) find_package(OGRE REQUIRED)
find_package(MyGUI REQUIRED) find_package(MyGUI REQUIRED)
find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS}) find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})

2
extern/shiny vendored

@ -1 +1 @@
Subproject commit 41245d1361bc0242e5d2c2313caffb711207e5fc Subproject commit 73ddc737ce6334b264649fd4b0a16109fd8b8a99
Loading…
Cancel
Save