Skip to content

Commit

Permalink
Merge pull request UCL#61 from UCL/fix-gbenchmark-git
Browse files Browse the repository at this point in the history
Add GIT_REPOSITORY argument to LookUpGBenchmark and default it to the google repo, instead of mayeul's fork.
  • Loading branch information
ilectra authored Jan 24, 2018
2 parents c89b908 + 521406b commit 6716c90
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion modules/LookUpGBenchmark.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# Installs GBenchmark into build directory
if(GBenchmark_ARGUMENTS)
cmake_parse_arguments(GBenchmark "" "GIT_REPOSITORY" "" ${GBenchmark_ARGUMENTS})
endif()
if(NOT GBenchmark_GIT_REPOSITORY)
set(GBenchmark_GIT_REPOSITORY https://github.com/google/benchmark.git)
endif()

include(PassonVariables)
passon_variables(GTest
FILENAME "${EXTERNAL_ROOT}/src/GBenchmarkVariables.cmake"
Expand All @@ -12,7 +19,7 @@ passon_variables(GTest

ExternalProject_Add(
Lookup-GBenchmark
GIT_REPOSITORY https://github.com/mdavezac/benchmark.git
GIT_REPOSITORY ${GBenchmark_GIT_REPOSITORY}
PREFIX "${EXTERNAL_ROOT}"
# Force separate output paths for debug and release builds to allow easy
# identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands
Expand Down

0 comments on commit 6716c90

Please sign in to comment.