Move to git submodule + CMake build

Author: coder5876

.gitignore

@@ -3,4 +3,5 @@ test
 *.d
 depinst
 depsrc
-
+*~
+build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "depends/libsnark"]
+	path = depends/libsnark
+	url = https://github.com/scipr-lab/libsnark.git

CMakeLists.txt

@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(libsnark-tutorial)
+
+set(
+  CURVE
+  "BN128"
+  CACHE
+  STRING
+  "Default curve: one of ALT_BN128, BN128, EDWARDS, MNT4, MNT6"
+)
+
+set(
+  DEPENDS_DIR
+  "${CMAKE_CURRENT_SOURCE_DIR}/depends"
+  CACHE
+  STRING
+  "Optionally specify the dependency installation directory relative to the source directory (default: inside dependency folder)"
+)
+
+set(
+  OPT_FLAGS
+  ""
+  CACHE
+  STRING
+  "Override C++ compiler optimization flags"
+)
+
+option(
+  MULTICORE
+  "Enable parallelized execution, using OpenMP"
+  OFF
+)
+
+option(
+  WITH_PROCPS
+  "Use procps for memory profiling"
+  ON
+)
+
+option(
+  VERBOSE
+  "Print internal messages"
+  OFF
+)
+
+if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  # Common compilation flags and warning configuration
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wfatal-errors -pthread")
+
+  if("${MULTICORE}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+  endif()
+
+   # Default optimizations flags (to override, use -DOPT_FLAGS=...)
+  if("${OPT_FLAGS}" STREQUAL "")
+    set(OPT_FLAGS "-ggdb3 -O2 -march=native -mtune=native")
+  endif()
+endif()
+
+add_definitions(-DCURVE_${CURVE})
+
+if(${CURVE} STREQUAL "BN128")
+  add_definitions(-DBN_SUPPORT_SNARK=1)
+endif()
+
+if("${VERBOSE}")
+  add_definitions(-DVERBOSE=1)
+endif()
+
+if("${MULTICORE}")
+  add_definitions(-DMULTICORE=1)
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPT_FLAGS}")
+
+include(FindPkgConfig)
+if("${WITH_PROCPS}")
+  pkg_check_modules(PROCPS REQUIRED libprocps)
+else()
+  add_definitions(-DNO_PROCPS)
+endif()
+
+include_directories(.)
+
+add_subdirectory(depends)
+add_subdirectory(src)

Makefile

@@ -0,0 +1 @@
+add_subdirectory(libsnark)

depends/CMakeLists.txt

@@ -0,0 +1,20 @@
+include_directories(.)
+
+add_executable(
+  main
+
+  test.cpp
+)
+target_link_libraries(
+  main
+
+  snark
+)
+target_include_directories(
+  main
+
+  PUBLIC
+  ${DEPENDS_DIR}/libsnark
+  ${DEPENDS_DIR}/libsnark/depends/libfqfft
+  ${DEPENDS_DIR}/libsnark/depends/libff
+)

depends/libsnark

@@ -1,21 +1,18 @@
 #include <stdlib.h>
 #include <iostream>
-#include <boost/optional/optional_io.hpp>
 
-#include "algebra/fields/field_utils.hpp"
+#include "libff/algebra/fields/field_utils.hpp"
 #include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
 #include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
-#include "libsnark/common/utils.hpp"
 #include "libsnark/gadgetlib1/pb_variable.hpp"
 
-
 using namespace libsnark;
 using namespace std;
 
 int main()
 {
 
-  typedef Fr<default_r1cs_ppzksnark_pp> FieldT;
+  typedef libff::Fr<default_r1cs_ppzksnark_pp> FieldT;
 
   // Initialize the curve parameters.
   default_r1cs_ppzksnark_pp::init_public_params();