1
Fork 0
mirror of https://github.com/Jaxan/hybrid-ads.git synced 2025-06-06 08:27:45 +02:00

Updates the build instructions. Updates the submodule url.

This commit is contained in:
Joshua Moerman 2015-09-25 16:47:32 +02:00
parent 5faac3fef7
commit 388e278b0b
4 changed files with 12 additions and 8 deletions

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "contrib/docopt.cpp"] [submodule "contrib/docopt.cpp"]
path = contrib/docopt.cpp path = contrib/docopt.cpp
url = git@github.com:Jaxan/docopt.cpp.git url = https://github.com/Jaxan/docopt.cpp.git

View file

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
find_package(Boost REQUIRED COMPONENTS iostreams program_options filesystem system serialization) find_package(Boost REQUIRED COMPONENTS)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/contrib/docopt.cpp") include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/contrib/docopt.cpp")
set(libs ${libs} ${Boost_LIBRARIES} docopt_s) set(libs ${libs} ${Boost_LIBRARIES} docopt_s)

View file

@ -20,7 +20,15 @@ the number of states, but could be used for alphabets).
## Building ## Building
The only dependency is boost. In order to build the project, one can use cmake. There are two dependencies: docopt.cpp (for handling program options) and boost
(for an optional type and string manipulations). The first dependency is a git
submodule and can be obtained with:
```
git submodule update --init
```
Assuming boost is installed on your system, we can build the tool with cmake:
``` ```
mkdir build mkdir build
@ -29,8 +37,7 @@ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
make make
``` ```
Then every .cpp file in the src directory will be built and generate an Note that you'll need c++14, but clang in Mac
executable in the build directory. Note that you'll need c++14, but clang in Mac
OSX will understand that (and if not, you'll have to update Xcode). The main OSX will understand that (and if not, you'll have to update Xcode). The main
sourcefile (`src/main.cpp`) can also be built with c++11 (this is tested on some sourcefile (`src/main.cpp`) can also be built with c++11 (this is tested on some
commits on both Windows and linux). commits on both Windows and linux).

View file

@ -3,9 +3,6 @@
#include "splitting_tree.hpp" #include "splitting_tree.hpp"
#include "trie.hpp" #include "trie.hpp"
#include <boost/range/algorithm.hpp>
#include <boost/range/algorithm_ext/erase.hpp>
#include <functional> #include <functional>
#include <stack> #include <stack>
#include <utility> #include <utility>