livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Okay, got Mac building with Boost 1.48. Unit tests needed NULL pointer 

defenses in the delete functions of the allocation support.  General
boost library renaming again.  Linux builds in TC though it shouldn't
based on what Boost.cmake lookes like...
meow-7.2.2
Monty Brandenberg 2012-05-08 10:38:08 -04:00
parent 74d59e7128
commit 7caef4bc6c
4 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
indra/cmake/Boost.cmake
View File

@ -53,11 +53,30 @@ else (STANDALONE)
optimized libboost_thread-mt
debug libboost_thread-mt-gd)
endif (MSVC80)
elseif (DARWIN OR LINUX)
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_THREAD_LIBRARY boost_thread)
elseif (LINUX)
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_THREAD_LIBRARY boost_thread-mt)
elseif (DARWIN)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized boost_program_options-mt
debug boost_program_options-mt-d)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized boost_program_options-mt
debug boost_program_options-mt-d)
set(BOOST_REGEX_LIBRARY
optimized boost_regex-mt
debug boost_regex-mt-d)
set(BOOST_SYSTEM_LIBRARY
optimized boost_system-mt
debug boost_system-mt-d)
set(BOOST_FILESYSTEM_LIBRARY
optimized boost_filesystem-mt
debug boost_filesystem-mt-d)
set(BOOST_THREAD_LIBRARY
optimized boost_thread-mt
debug boost_thread-mt-d)
endif (WINDOWS)
endif (STANDALONE)

2
indra/llcorehttp/CMakeLists.txt
View File

@ -78,7 +78,6 @@ target_link_libraries(
# tests
if (LL_TESTS)
#if (LL_TESTS AND 0)
SET(llcorehttp_TEST_SOURCE_FILES
tests/test_allocator.cpp
)
@ -117,5 +116,4 @@ if (LL_TESTS)
)
endif (LL_TESTS)
#endif (LL_TESTS AND 0)

6
indra/llcorehttp/tests/llcorehttp_test.cpp
View File

@ -27,8 +27,10 @@
#include <iostream>
#include <tut/tut.hpp>
#include <tut/tut_reporter.hpp>
// These are not the right way in viewer for some reason:
// #include <tut/tut.hpp>
// #include <tut/tut_reporter.hpp>
#include "../test/lltut.h"
#include <curl/curl.h>

10
indra/llcorehttp/tests/test_allocator.cpp
View File

@ -166,13 +166,19 @@ void * operator new[](std::size_t size) THROW_BAD_ALLOC()
void operator delete(void * p) THROW_NOTHING()
{
FreeMem( p );
if (p)
{
FreeMem( p );
}
}
void operator delete[](void * p) THROW_NOTHING()
{
FreeMem( p );
if (p)
{
FreeMem( p );
}
}