diff --git a/.gitmodules b/.gitmodules index 4e2c5b0..b953c7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "contrib/docopt.cpp"] path = contrib/docopt.cpp - url = git@github.com:Jaxan/docopt.cpp.git + url = https://github.com/Jaxan/docopt.cpp.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 85d57ba..0827d76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8) 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 "${PROJECT_SOURCE_DIR}/contrib/docopt.cpp") set(libs ${libs} ${Boost_LIBRARIES} docopt_s) diff --git a/README.md b/README.md index ac73941..ae3e765 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,15 @@ the number of states, but could be used for alphabets). ## 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 @@ -29,8 +37,7 @@ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. make ``` -Then every .cpp file in the src directory will be built and generate an -executable in the build directory. Note that you'll need c++14, but clang in Mac +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 sourcefile (`src/main.cpp`) can also be built with c++11 (this is tested on some commits on both Windows and linux). diff --git a/lib/separating_family.cpp b/lib/separating_family.cpp index 7fd5950..34e6c07 100644 --- a/lib/separating_family.cpp +++ b/lib/separating_family.cpp @@ -3,9 +3,6 @@ #include "splitting_tree.hpp" #include "trie.hpp" -#include -#include - #include #include #include