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

vc2008 is lame and needs a custom version of libboost, give it what it wants and get it to quit whining about warnings

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-25 04:32:17 -03:00
parent 3e7f54046a
commit 6ded084390
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/cmake/00-Common.cmake
View File

@@ -62,7 +62,8 @@ if (WINDOWS)
# Are we using the crummy Visual Studio KDU build workaround?
if (NOT VS_DISABLE_FATAL_WARNINGS)
add_definitions(/WX)
#ESTOY USANDO EL INTERNET
#add_definitions(/WX)
endif (NOT VS_DISABLE_FATAL_WARNINGS)
endif (WINDOWS)

26
indra/cmake/Boost.cmake
View File

@@ -15,18 +15,8 @@ else (STANDALONE)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
if (WINDOWS)
set(BOOST_VERSION 1_39)
if (MSVC71)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION}
debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION})
set(BOOST_REGEX_LIBRARY
optimized libboost_regex-vc71-mt-s-${BOOST_VERSION}
debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION})
set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-vc71-mt-s-${BOOST_VERSION}
debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
else (MSVC71)
set(BOOST_VERSION 1_36)
if (MSVC80)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -36,7 +26,17 @@ else (STANDALONE)
set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-vc80-mt-${BOOST_VERSION}
debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
endif (MSVC71)
elseif (MSVC90)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc90-mt-${BOOST_VERSION}
debug libboost_program_options-vc90-mt-gd-${BOOST_VERSION})
set(BOOST_REGEX_LIBRARY
optimized libboost_regex-vc90-mt-${BOOST_VERSION}
debug libboost_regex-vc90-mt-gd-${BOOST_VERSION})
set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-vc90-mt-${BOOST_VERSION}
debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
endif (MSVC80)
elseif (DARWIN)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)