As per title.
Depends on D1342
Details
Details
- Reviewers
deadalnix - Group Reviewers
Restricted Project - Commits
- rSTAGING713915afdac4: [cmake] support using brew for finding path prefixes on OSX
rABC713915afdac4: [cmake] support using brew for finding path prefixes on OSX
Run cmake and build
Diff Detail
Diff Detail
- Repository
- rABC Bitcoin ABC
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
There are a very large number of changes, so older changes are hidden. Show Older Changes
| cmake/modules/BrewHelper.cmake | ||
|---|---|---|
| 9 ↗ | (On Diff #3689) | Does this ever run ? This clearly require some kind of internal cache to not recompute the same value again and again, but I don't think this is the way. Even if it work, conssider: find_brew_prefix(FOO qt5) find_brew_prefix(BAR qt5) The cache should be based on NAME . |
| src/qt/CMakeLists.txt | ||
| 10 ↗ | (On Diff #3689) | ... |
| cmake/modules/BrewHelper.cmake | ||
|---|---|---|
| 1 ↗ | (On Diff #3722) |
|
| 10 ↗ | (On Diff #3722) | This isn't the proper way to cache that result. Something like: find_program(BREW brew)
if(NOT ${BREW})
return()
endif()
if(DEFINED "BREW_CACHED_PREFIX_${NAME}")
set(${VAR} ${BREW_CACHED_PREFIX_${NAME}} PARENT_SCOPE)
endif()
execute_process(
COMMAND ${BREW} --prefix ${NAME}
OUTPUT_VARIABLE PREFIX
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set("BREW_CACHED_PREFIX_${NAME}" ${PREFIX} CACHE PATH "Path for ${NAME} within brew")
set(${VAR} ${PREFIX} PARENT_SCOPE) |
| cmake/modules/BrewHelper.cmake | ||
|---|---|---|
| 10 ↗ | (On Diff #3722) | I responded before, it's not a cache. It's so it doesn't overwrite it with blank on on linux or otherwise if someone supplies it on the console. |
Comment Actions
Ok this looks good. I need to experiment a bit with cmake to make this indeed does what I think it does.
| CMakeLists.txt | ||
|---|---|---|
| 15 ↗ | (On Diff #3732) | Let me check this work as expected on linux. |
Comment Actions
Ok some minor details, but this is basically good to go.
| CMakeLists.txt | ||
|---|---|---|
| 16 ↗ | (On Diff #3732) | Ok it does as nothing is set if brew is not fond. Please move this wherever openssl is used. |
| cmake/modules/BrewHelper.cmake | ||
| 4 ↗ | (On Diff #3732) | This can be moved out of the function. |
| 21 ↗ | (On Diff #3732) | You were correct about this if the variable is defined, then you bail. This seems to be a standard cmake behavior. It's kind of weird, but I guess consistency has it virtue. |
| src/qt/CMakeLists.txt | ||
|---|---|---|
| 117 ↗ | (On Diff #3794) | Does this need to be it's own diff? It got pulled in here during my fiddling. |