mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-15 09:39:53 +00:00
Code Issues Projects Releases Wiki Activity

support system install for boost wave

Browse Source
This commit is contained in:
scrawl 2012-07-22 14:41:23 +02:00
parent 6bfcf2bc1b
commit b2dcf5adcd
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -186,9 +186,20 @@ if (UNIX AND NOT APPLE)
find_package (Threads) find_package (Threads)
endif() endif()
set(BOOST_COMPONENTS system filesystem program_options thread)
if (Boost_VERSION LESS 104900)
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(OGRE REQUIRED)
find_package(MyGUI REQUIRED) find_package(MyGUI REQUIRED)
find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread) find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
find_package(OIS REQUIRED) find_package(OIS REQUIRED)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(Bullet REQUIRED) find_package(Bullet REQUIRED)

2
extern/shiny vendored

@ -1 +1 @@
Subproject commit 34c098c636659b63e0ce85d371f4933c27191753 Subproject commit fdc92a4243c98f5d86a33cbdf2ed0fbb94dad3f6