Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ task :cache_cxx_dependencies do
cmake_flags << "-DCPM_DOWNLOAD_ALL=OFF"
cmake_flags << "-DCPM_USE_NAMED_CACHE_DIRECTORIES=ON"
cmake_flags << "-DCPM_USE_LOCAL_PACKAGES=OFF"
cmake_flags << "-DCPM_SOURCE_CACHE=\#{File.expand_path('cache', __dir__)}"
cmake_flags << "-DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE_ROOT=\#{File.expand_path('cache', __dir__)}"
cmake_flags << "-DCPM_SOURCE_CACHE=\#{__dir__}"
cmake_flags << "-DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE_ROOT=\#{__dir__}"
CACHE_FLAGS
end
end
Expand Down
4 changes: 3 additions & 1 deletion ext/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ def sys(*cmd)
extconf_include = File.expand_path("cache/extconf_include.rb", __dir__)
if File.exist?(extconf_include)
puts "-- include extra cmake options from #{extconf_include}"
eval(File.read(extconf_include)) # rubocop:disable Security/Eval
# Evaluated with the file name so that __dir__ inside the snippet resolves to the
# cache directory on the installing machine rather than nil.
eval(File.read(extconf_include), binding, extconf_include) # rubocop:disable Security/Eval
end

if ENV["CB_STATIC"] || ENV["CB_STATIC_BORINGSSL"]
Expand Down
Loading