Permalink
Browse files

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

…eference, updates libfqfft remote origin
  • Loading branch information...
howardwu committed Aug 1, 2017
1 parent 97a5d43 commit f4c74ba1f824b905f5f2fcc336b09b049d8d393b
Showing with 13 additions and 4 deletions.
  1. +1 −1 .travis.yml
  2. +1 −1 CMakeLists.txt
  3. +1 −1 README.md
  4. +1 −1 depends/libfqfft
  5. +9 −0 libsnark/CMakeLists.txt
View
@@ -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 ..
View
@@ -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")
View
@@ -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.
View
@@ -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
)

0 comments on commit f4c74ba

Please sign in to comment.