Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CMake] Further Apple M1 path improvements #2589

Merged
merged 2 commits into from
Oct 30, 2021
Merged

[CMake] Further Apple M1 path improvements #2589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e9af54
CMake: Add CPU based BDB root path detection for macOS
Fuzzbawls Oct 8, 2021
4c0123f
CMake: Add Apple Silicon homebrew Qt bin path to MOC search paths
Fuzzbawls Oct 8, 2021
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
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_definitions("-DMAC_OSX")
list(APPEND CMAKE_PREFIX_PATH /usr/local/opt/qt5 /opt/homebrew/opt/qt5)
list(APPEND CMAKE_PREFIX_PATH /usr/local/Cellar/berkeley-db@4 /opt/homebrew/Cellar/berkeley-db@4)
list(APPEND BerkeleyDB_ROOT_DIR "/usr/local/Cellar/berkeley-db@4/${BDB_VER}/" "/opt/homebrew/Cellar/berkeley-db@4/${BDB_VER}/")
# Homebrew default path for apple silicon CPUs is different than for intel CPUs
if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm")
set(BerkeleyDB_ROOT_DIR "/opt/homebrew/Cellar/berkeley-db@4/${BDB_VER}/")
else()
set(BerkeleyDB_ROOT_DIR "/usr/local/Cellar/berkeley-db@4/${BDB_VER}/" )
endif()
set(Boost_USE_MULTITHREADED ON)
set(Boost_NO_BOOST_CMAKE ON)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
Expand Down
2 changes: 1 addition & 1 deletion src/qt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if (QRCODE_FOUND)
endif()

find_program(MOC_BIN NAMES moc moc-qt5 qt5-moc
PATHS /usr/lib/qt5/bin /usr/lib/x86_64-linux-gnu/qt5/bin /usr/local/opt/qt/bin /usr/local/opt/qt5/bin
PATHS /usr/lib/qt5/bin /usr/lib/x86_64-linux-gnu/qt5/bin /usr/local/opt/qt/bin /usr/local/opt/qt5/bin /opt/homebrew/opt/qt5/bin
NO_DEFAULT_PATH
NO_SYSTEM_ENVIRONMENT_PATH)
if (MOC_BIN)
Expand Down