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? # Are we using the crummy Visual Studio KDU build workaround?
if (NOT VS_DISABLE_FATAL_WARNINGS) if (NOT VS_DISABLE_FATAL_WARNINGS)
add_definitions(/WX) #ESTOY USANDO EL INTERNET
#add_definitions(/WX)
endif (NOT VS_DISABLE_FATAL_WARNINGS) endif (NOT VS_DISABLE_FATAL_WARNINGS)
endif (WINDOWS) endif (WINDOWS)

26
indra/cmake/Boost.cmake
View File

@@ -15,18 +15,8 @@ else (STANDALONE)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
if (WINDOWS) if (WINDOWS)
set(BOOST_VERSION 1_39) set(BOOST_VERSION 1_36)
if (MSVC71) if (MSVC80)
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_PROGRAM_OPTIONS_LIBRARY set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc80-mt-${BOOST_VERSION} optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -36,7 +26,17 @@ else (STANDALONE)
set(BOOST_SIGNALS_LIBRARY set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-vc80-mt-${BOOST_VERSION} optimized libboost_signals-vc80-mt-${BOOST_VERSION}
debug libboost_signals-vc80-mt-gd-${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) elseif (DARWIN)
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)

13
install.xml
View File

@@ -194,6 +194,7 @@
<key>license</key> <key>license</key>
<string>sleepycat</string> <string>sleepycat</string>
</map> </map>
<!-- Use some of the boost libraries from imprudence because of FUCKING WINDOWS 98 (should probably host this somewhere else in the future) -->
<key>boost</key> <key>boost</key>
<map> <map>
<key>copyright</key> <key>copyright</key>
@@ -207,23 +208,23 @@
<key>darwin</key> <key>darwin</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>bb8552f22769da81593f7d47a51d83d8</string> <string>279834a12a0ed4531fd602594eac8509</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100226.tar.bz2</uri> <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.32.0-darwin-20080812.tar.bz2</uri>
</map> </map>
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>d58ac1a8396ac983b67cc3e3541457e3</string> <string>15149b8140d06f9bd1b8672b958c6915</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100222a.tar.bz2</uri> <uri>http://imprudenceviewer.org/download/libs/boost-1.36.0-linux-20091128.tar.bz2</uri>
</map> </map>
<key>windows</key> <key>windows</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>ed53511382d0fd9fec59a9f6544d9672</string> <string>094acc8173faca882ed9532e868d767f</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20091029.tar.bz2</uri> <uri>http://imprudenceviewer.org/download/libs/boost-1.36.0-windows-20091124.tar.bz2</uri>
</map> </map>
</map> </map>
</map> </map>