diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/cgalcachetest.cc | 3 | ||||
| -rw-r--r-- | tests/cgalpngtest.cc | 3 | ||||
| -rw-r--r-- | tests/cgalstlsanitytest.cc | 3 | ||||
| -rw-r--r-- | tests/cgaltest.cc | 3 | ||||
| -rw-r--r-- | tests/csgtermtest.cc | 3 | ||||
| -rw-r--r-- | tests/csgtestcore.cc | 3 | ||||
| -rw-r--r-- | tests/csgtexttest.cc | 3 | ||||
| -rw-r--r-- | tests/dumptest.cc | 3 | ||||
| -rw-r--r-- | tests/echotest.cc | 3 |
10 files changed, 19 insertions, 13 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9d5e24e..4534b67 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -125,10 +125,7 @@ if (NOT $ENV{BOOSTDIR} STREQUAL "") message(STATUS "BOOST_ROOT: " ${BOOST_ROOT}) endif() -find_package( Boost 1.44.0 COMPONENTS thread program_options filesystem system regex REQUIRED) -if ( ${Boost_VERSION} VERSION_LESS "104601" ) - add_definitions( -DBOOST_FILESYSTEM_VERSION=3 ) -endif() +find_package( Boost 1.35.0 COMPONENTS thread program_options filesystem system regex REQUIRED) message(STATUS "Boost includes found: " ${Boost_INCLUDE_DIRS}) message(STATUS "Boost libraries found:") foreach(boostlib ${Boost_LIBRARIES}) diff --git a/tests/cgalcachetest.cc b/tests/cgalcachetest.cc index ad856d2..1680c6e 100644 --- a/tests/cgalcachetest.cc +++ b/tests/cgalcachetest.cc @@ -53,6 +53,7 @@ namespace fs = boost::filesystem; #include <boost/program_options.hpp> namespace po = boost::program_options; +#include "boosty.h" std::string commandline_commands; std::string currentdir; @@ -135,7 +136,7 @@ int main(int argc, char **argv) QApplication app(argc, argv, false); fs::path original_path = fs::current_path(); - currentdir = fs::current_path().generic_string(); + currentdir = boosty::stringy( fs::current_path() ); parser_init(QApplication::instance()->applicationDirPath().toStdString()); diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc index ca37572..9002f3b 100644 --- a/tests/cgalpngtest.cc +++ b/tests/cgalpngtest.cc @@ -53,6 +53,7 @@ #include <boost/filesystem.hpp> namespace fs = boost::filesystem; +#include "boosty.h" std::string commandline_commands; std::string currentdir; @@ -108,7 +109,7 @@ int main(int argc, char **argv) QApplication app(argc, argv, false); fs::path original_path = fs::current_path(); - currentdir = fs::current_path().generic_string(); + currentdir = boosty::stringy( fs::current_path() ); parser_init(QApplication::instance()->applicationDirPath().toStdString()); diff --git a/tests/cgalstlsanitytest.cc b/tests/cgalstlsanitytest.cc index e537b4a..548ab44 100644 --- a/tests/cgalstlsanitytest.cc +++ b/tests/cgalstlsanitytest.cc @@ -52,6 +52,7 @@ #include <boost/filesystem.hpp> namespace fs = boost::filesystem; +#include "boosty.h" std::string commandline_commands; std::string currentdir; @@ -94,7 +95,7 @@ int main(int argc, char **argv) QApplication app(argc, argv, false); fs::path original_path = fs::current_path(); - currentdir = fs::current_path().generic_string(); + currentdir = boosty::stringy( fs::current_path() ); parser_init(QApplication::instance()->applicationDirPath().toStdString()); diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc index 956bf43..4c23ee1 100644 --- a/tests/cgaltest.cc +++ b/tests/cgaltest.cc @@ -48,6 +48,7 @@ #include <boost/filesystem.hpp> namespace fs = boost::filesystem; +#include "boosty.h" std::string commandline_commands; std::string currentdir; @@ -87,7 +88,7 @@ int main(int argc, char **argv) QApplication app(argc, argv, false); fs::path original_path = fs::current_path(); - currentdir = fs::current_path().generic_string(); + currentdir = boosty::stringy( fs::current_path() ); parser_init(QApplication::instance()->applicationDirPath().toStdString()); diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index 016285e..a7369e8 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -49,6 +49,7 @@ #include <boost/filesystem.hpp> namespace fs = boost::filesystem; +#include "boosty.h" std::string commandline_commands; std::string currentdir; @@ -73,7 +74,7 @@ int main(int argc, char **argv) QApplication app(argc, argv, false); fs::path original_path = fs::current_path(); - currentdir = fs::current_path().generic_string(); + currentdir = boosty::stringy( fs::current_path() ); parser_init(QApplication::instance()->applicationDirPath().toStdString()); diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc index 65e9127..b5a6224 100644 --- a/tests/csgtestcore.cc +++ b/tests/csgtestcore.cc @@ -34,6 +34,7 @@ namespace po = boost::program_options; namespace fs = boost::filesystem; +#include "boosty.h" using std::string; using std::vector; @@ -254,7 +255,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) fs::path original_path = fs::current_path(); - std::string currentdir = fs::current_path().generic_string(); + std::string currentdir = boosty::stringy( fs::current_path() ); parser_init(QApplication::instance()->applicationDirPath().toStdString()); diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc index daed4e4..4a1c9c6 100644 --- a/tests/csgtexttest.cc +++ b/tests/csgtexttest.cc @@ -48,6 +48,7 @@ #include <boost/filesystem.hpp> namespace fs = boost::filesystem; +#include "boosty.h" std::string commandline_commands; std::string currentdir; @@ -77,7 +78,7 @@ int main(int argc, char **argv) QApplication app(argc, argv, false); fs::path original_path = fs::current_path(); - currentdir = fs::current_path().generic_string(); + currentdir = boosty::stringy( fs::current_path() ); parser_init(QApplication::instance()->applicationDirPath().toStdString()); diff --git a/tests/dumptest.cc b/tests/dumptest.cc index 6dd65a4..8353f26 100644 --- a/tests/dumptest.cc +++ b/tests/dumptest.cc @@ -46,6 +46,7 @@ #include <boost/filesystem.hpp> namespace fs = boost::filesystem; +#include "boosty.h" std::string commandline_commands; std::string currentdir; @@ -83,7 +84,7 @@ int main(int argc, char **argv) QApplication app(argc, argv, false); fs::path original_path = fs::current_path(); - currentdir = fs::current_path().generic_string(); + currentdir = boosty::stringy( fs::current_path() ); parser_init(QApplication::instance()->applicationDirPath().toStdString()); diff --git a/tests/echotest.cc b/tests/echotest.cc index 7abfd78..b881503 100644 --- a/tests/echotest.cc +++ b/tests/echotest.cc @@ -45,6 +45,7 @@ #include <boost/filesystem.hpp> namespace fs = boost::filesystem; +#include "boosty.h" std::string commandline_commands; std::string currentdir; @@ -85,7 +86,7 @@ int main(int argc, char **argv) QApplication app(argc, argv, false); fs::path original_path = fs::current_path(); - currentdir = fs::current_path().generic_string(); + currentdir = boosty::stringy( fs::current_path() ); parser_init(QApplication::instance()->applicationDirPath().toStdString()); |