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

Merge branch 'master' of https://github.com/LightDrake/SingularityViewer

Browse Source
This commit is contained in:
Drake Arconis
2013-10-07 23:24:04 -04:00
parent a4fa66655e 008eac5a8d
commit 010723eea6
9 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/Boost.cmake
View File

@@ -8,7 +8,7 @@ if (STANDALONE)
include(FindBoost)
set(Boost_USE_MULTITHREADED ON)
find_package(Boost 1.40.0 COMPONENTS date_time filesystem program_options regex system thread wave)
find_package(Boost 1.51.0 COMPONENTS date_time filesystem program_options regex system thread wave context)
else (STANDALONE)
use_prebuilt_binary(boost)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)

4
indra/cmake/Colladadom.cmake
View File

@@ -10,9 +10,9 @@ if (STANDALONE)
else (STANDALONE)
use_prebuilt_binary(colladadom)
if (NOT WINDOWS)
if (NOT WINDOWS AND NOT LINUX)
use_prebuilt_binary(pcre)
endif (NOT WINDOWS)
endif (NOT WINDOWS AND NOT LINUX)
if (NOT DARWIN AND NOT WINDOWS)
use_prebuilt_binary(libxml)

2
indra/cmake/FindGoogleBreakpad.cmake
View File

@@ -11,8 +11,6 @@
FIND_PATH(BREAKPAD_INCLUDE_DIRECTORIES common/using_std_string.h PATH_SUFFIXES google_breakpad)
MESSAGE("BREAKPAD_INCLUDE_DIRECTORIES = \"${BREAKPAD_INCLUDE_DIRECTORIES}\".")
SET(BREAKPAD_EXCEPTION_HANDLER_NAMES ${BREAKPAD_EXCEPTION_HANDLER_NAMES} breakpad_client)
FIND_LIBRARY(BREAKPAD_EXCEPTION_HANDLER_LIBRARY
NAMES ${BREAKPAD_EXCEPTION_HANDLER_NAMES}