diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-06 21:34:43 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-06 21:34:43 (GMT) |
| commit | b3fa4d98a41b32547e1ec661f826913d3540c929 (patch) | |
| tree | 8d6bf38b49943facd01a9164cb1c64b976cdbaa8 | |
| parent | d9d584ff106d0fb9cfd538cc83f94f9356287c54 (diff) | |
Added regex to boost build
| -rw-r--r-- | boost.pri | 2 | ||||
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 3 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -22,7 +22,7 @@ boost { } else { # some platforms have only '-mt' versions. uncomment if needed. # LIBS += -lboost_thread-mt -lboost_program_options-mt - LIBS += -lboost_thread -lboost_program_options -lboost_filesystem -lboost_system + LIBS += -lboost_thread -lboost_program_options -lboost_filesystem -lboost_system -lboost_regex } } } diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 903c7de..cd2b07f 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -140,13 +140,14 @@ build_boost() tar xjf boost_$bversion.tar.bz2 cd boost_$bversion # We only need the thread and program_options libraries - ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system + ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex ./bjam cflags="-mmacosx-version-min=10.5 -arch i386 -arch x86_64" linkflags="-mmacosx-version-min=10.5 -arch i386 -arch x86_64" ./bjam install install_name_tool -id $DEPLOYDIR/lib/libboost_thread.dylib $DEPLOYDIR/lib/libboost_thread.dylib install_name_tool -id $DEPLOYDIR/lib/libboost_program_options.dylib $DEPLOYDIR/lib/libboost_program_options.dylib install_name_tool -id $DEPLOYDIR/lib/libboost_filesystem.dylib $DEPLOYDIR/lib/libboost_filesystem.dylib install_name_tool -id $DEPLOYDIR/lib/libboost_system.dylib $DEPLOYDIR/lib/libboost_system.dylib + install_name_tool -id $DEPLOYDIR/lib/libboost_regex.dylib $DEPLOYDIR/lib/libboost_regex.dylib } build_cgal() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index df9598e..75fb99c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -79,7 +79,7 @@ if(BOOST_ROOT) #set(Boost_DEBUG TRUE) set(Boost_NO_SYSTEM_PATHS TRUE) set(Boost_ADDITIONAL_VERSIONS "1.47.0") - find_package( Boost 1.35.0 COMPONENTS thread program_options filesystem system ) + find_package( Boost 1.35.0 COMPONENTS thread program_options filesystem system regex ) if(Boost_FOUND) message(STATUS "Boost includes found: " ${Boost_INCLUDE_DIRS}) message(STATUS "Boost libraries found:") |