Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cmake changes needed for standalone

Browse Source
This commit is contained in:
Drake Arconis
2012-09-07 17:53:13 -04:00
parent 9b66d74382
commit 86ad4aabf3
7 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
indra/cmake/Boost.cmake
View File

@@ -7,10 +7,8 @@ set(Boost_FIND_REQUIRED ON)
if (STANDALONE) if (STANDALONE)
include(FindBoost) include(FindBoost)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(Boost_USE_MULTITHREADED ON)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) find_package(Boost 1.40.0 COMPONENTS date_time filesystem program_options regex system thread wave)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
else (STANDALONE) else (STANDALONE)
use_prebuilt_binary(boost) use_prebuilt_binary(boost)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
@@ -18,36 +16,36 @@ else (STANDALONE)
if (WINDOWS) if (WINDOWS)
set(BOOST_VERSION 1_45) set(BOOST_VERSION 1_45)
# SNOW-788 # SNOW-788
# 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc # 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 # 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 # 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. # boost libs are avaiable - RC.
if (MSVC71) if (MSVC71)
set(BOOST_OPTIM_SUFFIX mt-s) set(BOOST_OPTIM_SUFFIX mt-s)
set(BOOST_DEBUG_SUFFIX mt-sgd) set(BOOST_DEBUG_SUFFIX mt-sgd)
else (MSVC71) else (MSVC71)
set(BOOST_OPTIM_SUFFIX mt) set(BOOST_OPTIM_SUFFIX mt)
set(BOOST_DEBUG_SUFFIX mt-gd) set(BOOST_DEBUG_SUFFIX mt-gd)
endif (MSVC71) endif (MSVC71)
set(BOOST_PROGRAM_OPTIONS_LIBRARY set(Boost_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_DEBUG_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} optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION}
debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
elseif (DARWIN) elseif (DARWIN)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem) set(Boost_FILESYSTEM_LIBRARY boost_filesystem)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options) set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options)
set(BOOST_REGEX_LIBRARY boost_regex) set(Boost_REGEX_LIBRARY boost_regex)
set(BOOST_SYSTEM_LIBRARY boost_system) set(Boost_SYSTEM_LIBRARY boost_system)
elseif (LINUX) elseif (LINUX)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(Boost_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt) set(Boost_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt) set(Boost_SYSTEM_LIBRARY boost_system-mt)
endif (WINDOWS) endif (WINDOWS)
endif (STANDALONE) endif (STANDALONE)

25
indra/cmake/FMODEX.cmake
View File

@@ -8,7 +8,7 @@ if(INSTALL_PROPRIETARY)
endif(INSTALL_PROPRIETARY) endif(INSTALL_PROPRIETARY)
find_library(FMODEX_LIBRARY find_library(FMODEX_LIBRARY
NAMES fmodex fmodex_vc fmodexL_vc NAMES fmodex fmodexL fmodex_vc fmodexL_vc
PATHS PATHS
optimized ${ARCH_PREBUILT_DIRS_RELEASE} optimized ${ARCH_PREBUILT_DIRS_RELEASE}
debug ${ARCH_PREBUILT_DIRS_DEBUG} debug ${ARCH_PREBUILT_DIRS_DEBUG}
@@ -26,26 +26,25 @@ if (NOT FMODEX_LIBRARY)
${FMODEX_SDK_DIR} ${FMODEX_SDK_DIR}
) )
endif(FMODEX_SDK_DIR) endif(FMODEX_SDK_DIR)
if(WINDOWS AND NOT FMODEX_LIBRARY) if(WINDOWS AND NOT FMODEX_LIBRARY)
set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows") set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows")
find_library(FMODEX_LIBRARY find_library(FMODEX_LIBRARY
fmodex_vc fmodexL_vc fmodex_vc fmodexL_vc
PATHS PATHS
${FMODEX_PROG_DIR}/api/lib ${FMODEX_PROG_DIR}/api/lib
${FMODEX_PROG_DIR}/api ${FMODEX_PROG_DIR}/api
${FMODEX_PROG_DIR} ${FMODEX_PROG_DIR}
) )
if(FMODEX_LIBRARY) if(FMODEX_LIBRARY)
message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}") message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}")
set(FMODEX_SDK_DIR ${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) set(FMODEX_SDK_DIR ${FMODEX_PROG_DIR} CACHE PATH "Path to the FMOD Ex SDK." FORCE)
endif(FMODEX_LIBRARY) endif(FMODEX_LIBRARY)
endif(WINDOWS AND NOT FMODEX_LIBRARY) endif(WINDOWS AND NOT FMODEX_LIBRARY)
endif (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}/include/fmodex
${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex
${FMODEX_SDK_DIR}/api/inc ${FMODEX_SDK_DIR}/api/inc

2
indra/cmake/FindHunSpell.cmake
View File

@@ -5,7 +5,7 @@ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell.hxx
/usr/include /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 FIND_LIBRARY(HUNSPELL_LIBRARY
NAMES ${HUNSPELL_NAMES} NAMES ${HUNSPELL_NAMES}
PATHS /usr/lib /usr/local/lib PATHS /usr/lib /usr/local/lib

2
indra/cmake/LLVFS.cmake
View File

@@ -8,5 +8,5 @@ set(LLVFS_INCLUDE_DIRS
set(LLVFS_LIBRARIES set(LLVFS_LIBRARIES
llvfs llvfs
${BOOST_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
) )

2
indra/llcommon/CMakeLists.txt
View File

@@ -265,7 +265,7 @@ target_link_libraries(
${EXPAT_LIBRARIES} ${EXPAT_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
${BOOST_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
${CWDEBUG_LIBRARIES} ${CWDEBUG_LIBRARIES}
${CORESERVICES_LIBRARY} ${CORESERVICES_LIBRARY}
) )

4
indra/llvfs/CMakeLists.txt
View File

@@ -63,8 +63,8 @@ add_library (llvfs ${llvfs_SOURCE_FILES})
add_dependencies(llvfs prepare) add_dependencies(llvfs prepare)
target_link_libraries(llvfs target_link_libraries(llvfs
${BOOST_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${BOOST_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
) )
if (DARWIN) if (DARWIN)

14
indra/newview/CMakeLists.txt
View File

@@ -8,10 +8,10 @@ include(DBusGlib)
include(DirectX) include(DirectX)
include(ELFIO) include(ELFIO)
if(FMODEX) if(FMODEX)
include(FMODEX) include(FMODEX)
set(FMOD OFF) set(FMOD OFF)
else(FMODEX) else(FMODEX)
include(FMOD) include(FMOD)
endif(FMODEX) endif(FMODEX)
include(OPENAL) include(OPENAL)
include(FindOpenGL) include(FindOpenGL)
@@ -1560,10 +1560,10 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
${NDOF_LIBRARY} ${NDOF_LIBRARY}
${viewer_LIBRARIES} ${viewer_LIBRARIES}
${BOOST_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${BOOST_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
${BOOST_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${DBUSGLIB_LIBRARIES} ${DBUSGLIB_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${FMODWRAPPER_LIBRARY} # must come after LLAudio ${FMODWRAPPER_LIBRARY} # must come after LLAudio