Update DEPENDS_DIR to absolute path addressing, adds libff includes r…

…eference, updates libfqfft remote origin
scipr-lab · Aug 1, 2017 · f4c74ba · f4c74ba
1 parent 97a5d43
commit f4c74ba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ before_install:
 
 before_script:
   # Install git submodules
-  - git submodule update --init --recursive
+  - git submodule init && git submodule update
   - mkdir build
   - cd build
   - cmake ..

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -98,7 +98,7 @@ if("${DEPENDS_DIR}" STREQUAL "")
     "Optionally specify the dependency installation directory relative to the source directory (default: inside dependency folder)"
   )
 else()
-  set(DEPENDS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${DEPENDS_DIR}")
+  set(DEPENDS_DIR "${DEPENDS_DIR}")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

diff --git a/README.md b/README.md
@@ -430,7 +430,7 @@ to control these (you can see the default at the top of CMakeLists.txt).
 
 *   `cmake -DDEPENDS_DIR=...`
 
-    Sets the dependency installation directory to the provided relative path from the source directory (default: installs dependencies in the respective submodule directories)
+    Sets the dependency installation directory to the provided absolute path (default: installs dependencies in the respective submodule directories)
 
 Not all combinations are tested together or supported by every part of the codebase.
 

diff --git a/depends/libfqfft b/depends/libfqfft
diff --git a/libsnark/CMakeLists.txt b/libsnark/CMakeLists.txt
@@ -55,6 +55,7 @@ target_include_directories(
   snark
 
   PUBLIC
+  ${DEPENDS_DIR}/libff
   ${DEPENDS_DIR}/libfqfft
 )
 
@@ -741,3 +742,11 @@ add_dependencies(check test_merkle_tree_gadgets)
 add_dependencies(check test_set_commitment_gadget)
 add_dependencies(check test_sha256_gadget)
 
+set(
+  CTEST_CUSTOM_TESTS_IGNORE
+  ${CTEST_CUSTOM_TESTS_IGNORE}
+  gadgetlib1_fooram_test
+  zk_proof_systems_r1cs_mp_ppzkpcd_test
+  zk_proof_systems_r1cs_sp_ppzkpcd_test
+  zk_proof_systems_ram_zksnark_test
+)