diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt index b5660d56..09b0ef5b 100644 --- a/unicorn/CMakeLists.txt +++ b/unicorn/CMakeLists.txt @@ -11,7 +11,7 @@ set_cmake_policies() set_lib_link_mode() setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") - setup_boost(program_options filesystem python regex) + setup_boost(program_options python regex) find_package(LibXml2 REQUIRED) set(QT_USE_QTXML "true") diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt index 3febee4e..64c880c1 100644 --- a/unicorn/src/CMakeLists.txt +++ b/unicorn/src/CMakeLists.txt @@ -84,6 +84,7 @@ install ( TARGETS pyUnicorn DESTINATION ${PYTHON_SITE_PACKAGES} ) install ( TARGETS cgt.bin DESTINATION bin ) install ( PROGRAMS cgt.py DESTINATION bin RENAME cgt ) + install ( PROGRAMS cgt3.py DESTINATION bin RENAME cgt3 ) install ( FILES ${mocincludes} ${pyIncludes} DESTINATION include/coriolis2/unicorn ) diff --git a/unicorn/src/CgtMain.cpp b/unicorn/src/CgtMain.cpp index f0b2af1a..624afd0e 100644 --- a/unicorn/src/CgtMain.cpp +++ b/unicorn/src/CgtMain.cpp @@ -2,7 +2,7 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved +// Copyright (c) UPMC 2008-2013, All Rights Reserved // // +-----------------------------------------------------------------+ // | C O R I O L I S | @@ -23,9 +23,7 @@ using namespace std; #include namespace bopts = boost::program_options; -#include -namespace bfs = boost::filesystem; - +#include "vlsisapd/utilities/Path.h" #include "vlsisapd/bookshelf/Exception.h" #include "vlsisapd/configuration/Configuration.h" #include "hurricane/DebugSession.h" @@ -90,8 +88,6 @@ int main ( int argc, char *argv[] ) bool kiteSuccess = true; try { - bfs::path::default_name_check ( bfs::portable_posix_name ); - bool destroyDatabase; float edgeCapacity; unsigned long eventsLimit; @@ -183,8 +179,8 @@ int main ( int argc, char *argv[] ) } if ( arguments.count("conf") ) { - bfs::path userConfFile = arguments["conf"].as(); - if ( bfs::exists(userConfFile) ) { + Utilities::Path userConfFile ( arguments["conf"].as() ); + if ( userConfFile.exists() ) { Cfg::Configuration* conf = Cfg::Configuration::get (); conf->readFromFile ( userConfFile.string() ); } else {