From 86ad4aabf319485fc39ddbe33929848df7b950de Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Fri, 7 Sep 2012 17:53:13 -0400 Subject: [PATCH] Cmake changes needed for standalone --- indra/cmake/Boost.cmake | 56 ++++++++++++++++------------------ indra/cmake/FMODEX.cmake | 25 ++++++++------- indra/cmake/FindHunSpell.cmake | 2 +- indra/cmake/LLVFS.cmake | 2 +- indra/llcommon/CMakeLists.txt | 2 +- indra/llvfs/CMakeLists.txt | 4 +-- indra/newview/CMakeLists.txt | 14 ++++----- 7 files changed, 51 insertions(+), 54 deletions(-) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 8a3620b47..434dbff44 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -7,10 +7,8 @@ set(Boost_FIND_REQUIRED ON) if (STANDALONE) include(FindBoost) - set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) - set(BOOST_REGEX_LIBRARY boost_regex-mt) - set(BOOST_SYSTEM_LIBRARY boost_system-mt) + set(Boost_USE_MULTITHREADED ON) + find_package(Boost 1.40.0 COMPONENTS date_time filesystem program_options regex system thread wave) else (STANDALONE) use_prebuilt_binary(boost) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) @@ -18,36 +16,36 @@ else (STANDALONE) if (WINDOWS) set(BOOST_VERSION 1_45) - # SNOW-788 - # 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc - # The precompiled boost libs for VC71 use a different suffix to VS80 and VS90 - # This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate - # boost libs are avaiable - RC. - - if (MSVC71) - set(BOOST_OPTIM_SUFFIX mt-s) - set(BOOST_DEBUG_SUFFIX mt-sgd) - else (MSVC71) - set(BOOST_OPTIM_SUFFIX mt) - set(BOOST_DEBUG_SUFFIX mt-gd) - endif (MSVC71) - - set(BOOST_PROGRAM_OPTIONS_LIBRARY + # SNOW-788 + # 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc + # The precompiled boost libs for VC71 use a different suffix to VS80 and VS90 + # This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate + # boost libs are avaiable - RC. + + if (MSVC71) + set(BOOST_OPTIM_SUFFIX mt-s) + set(BOOST_DEBUG_SUFFIX mt-sgd) + else (MSVC71) + set(BOOST_OPTIM_SUFFIX mt) + set(BOOST_DEBUG_SUFFIX mt-gd) + endif (MSVC71) + + set(Boost_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} debug libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) - set(BOOST_REGEX_LIBRARY + set(Boost_REGEX_LIBRARY optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) - + elseif (DARWIN) - set(BOOST_FILESYSTEM_LIBRARY boost_filesystem) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options) - set(BOOST_REGEX_LIBRARY boost_regex) - set(BOOST_SYSTEM_LIBRARY boost_system) + set(Boost_FILESYSTEM_LIBRARY boost_filesystem) + set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options) + set(Boost_REGEX_LIBRARY boost_regex) + set(Boost_SYSTEM_LIBRARY boost_system) elseif (LINUX) - set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) - set(BOOST_REGEX_LIBRARY boost_regex-mt) - set(BOOST_SYSTEM_LIBRARY boost_system-mt) + set(Boost_FILESYSTEM_LIBRARY boost_filesystem-mt) + set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) + set(Boost_REGEX_LIBRARY boost_regex-mt) + set(Boost_SYSTEM_LIBRARY boost_system-mt) endif (WINDOWS) endif (STANDALONE) diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake index 9a39b1264..0a4bc0647 100644 --- a/indra/cmake/FMODEX.cmake +++ b/indra/cmake/FMODEX.cmake @@ -8,7 +8,7 @@ if(INSTALL_PROPRIETARY) endif(INSTALL_PROPRIETARY) find_library(FMODEX_LIBRARY - NAMES fmodex fmodex_vc fmodexL_vc + NAMES fmodex fmodexL fmodex_vc fmodexL_vc PATHS optimized ${ARCH_PREBUILT_DIRS_RELEASE} debug ${ARCH_PREBUILT_DIRS_DEBUG} @@ -26,26 +26,25 @@ if (NOT FMODEX_LIBRARY) ${FMODEX_SDK_DIR} ) - endif(FMODEX_SDK_DIR) if(WINDOWS AND NOT FMODEX_LIBRARY) - set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows") - find_library(FMODEX_LIBRARY - fmodex_vc fmodexL_vc + set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows") + find_library(FMODEX_LIBRARY + fmodex_vc fmodexL_vc PATHS ${FMODEX_PROG_DIR}/api/lib - ${FMODEX_PROG_DIR}/api - ${FMODEX_PROG_DIR} + ${FMODEX_PROG_DIR}/api + ${FMODEX_PROG_DIR} ) - if(FMODEX_LIBRARY) - message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}") - set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR}) - set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR} CACHE PATH "Path to the FMOD Ex SDK." FORCE) - endif(FMODEX_LIBRARY) + if(FMODEX_LIBRARY) + message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}") + set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR}) + set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR} CACHE PATH "Path to the FMOD Ex SDK." FORCE) + endif(FMODEX_LIBRARY) endif(WINDOWS AND NOT FMODEX_LIBRARY) endif (NOT FMODEX_LIBRARY) -find_path(FMODEX_INCLUDE_DIR fmod.h +find_path(FMODEX_INCLUDE_DIR fmod.hpp ${LIBS_PREBUILT_DIR}/include/fmodex ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex ${FMODEX_SDK_DIR}/api/inc diff --git a/indra/cmake/FindHunSpell.cmake b/indra/cmake/FindHunSpell.cmake index d41f9cf76..31576eb56 100644 --- a/indra/cmake/FindHunSpell.cmake +++ b/indra/cmake/FindHunSpell.cmake @@ -5,7 +5,7 @@ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell.hxx /usr/include ) -SET(HUNSPELL_NAMES ${HUNSPELL_NAMES} hunspell hunspell-1.2) +SET(HUNSPELL_NAMES ${HUNSPELL_NAMES} hunspell hunspell-1.2 hunspell-1.3) FIND_LIBRARY(HUNSPELL_LIBRARY NAMES ${HUNSPELL_NAMES} PATHS /usr/lib /usr/local/lib diff --git a/indra/cmake/LLVFS.cmake b/indra/cmake/LLVFS.cmake index 0ff227c12..a71976465 100644 --- a/indra/cmake/LLVFS.cmake +++ b/indra/cmake/LLVFS.cmake @@ -8,5 +8,5 @@ set(LLVFS_INCLUDE_DIRS set(LLVFS_LIBRARIES llvfs - ${BOOST_REGEX_LIBRARY} + ${Boost_REGEX_LIBRARY} ) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 64e0140e1..fe7ff31c6 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -265,7 +265,7 @@ target_link_libraries( ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} ${WINDOWS_LIBRARIES} - ${BOOST_REGEX_LIBRARY} + ${Boost_REGEX_LIBRARY} ${CWDEBUG_LIBRARIES} ${CORESERVICES_LIBRARY} ) diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt index e5889805b..8dabf5b91 100644 --- a/indra/llvfs/CMakeLists.txt +++ b/indra/llvfs/CMakeLists.txt @@ -63,8 +63,8 @@ add_library (llvfs ${llvfs_SOURCE_FILES}) add_dependencies(llvfs prepare) target_link_libraries(llvfs - ${BOOST_FILESYSTEM_LIBRARY} - ${BOOST_SYSTEM_LIBRARY} + ${Boost_FILESYSTEM_LIBRARY} + ${Boost_SYSTEM_LIBRARY} ) if (DARWIN) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index e1742fc20..884164934 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -8,10 +8,10 @@ include(DBusGlib) include(DirectX) include(ELFIO) if(FMODEX) - include(FMODEX) - set(FMOD OFF) + include(FMODEX) + set(FMOD OFF) else(FMODEX) - include(FMOD) + include(FMOD) endif(FMODEX) include(OPENAL) include(FindOpenGL) @@ -1560,10 +1560,10 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLCOMMON_LIBRARIES} ${NDOF_LIBRARY} ${viewer_LIBRARIES} - ${BOOST_FILESYSTEM_LIBRARY} - ${BOOST_PROGRAM_OPTIONS_LIBRARY} - ${BOOST_REGEX_LIBRARY} - ${BOOST_SYSTEM_LIBRARY} + ${Boost_FILESYSTEM_LIBRARY} + ${Boost_PROGRAM_OPTIONS_LIBRARY} + ${Boost_REGEX_LIBRARY} + ${Boost_SYSTEM_LIBRARY} ${DBUSGLIB_LIBRARIES} ${OPENGL_LIBRARIES} ${FMODWRAPPER_LIBRARY} # must come after LLAudio