diff --git a/CMakeLists.txt b/CMakeLists.txt index 3065822d..3b45c66f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,7 +131,22 @@ option(ZLIB_SUPPORT "Zlib plugin support" ${DEFAULT_ZLIB_SUPPORT}) option(DIGEST_SUPPORT "Digest plugin support" ${DEFAULT_DIGEST_SUPPORT}) option(DIGEST_SUPPORT_EXTENDED "Enable additional hash algorithms" ${DEFAULT_DIGEST_SUPPORT}) +if(APPLE AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + execute_process( + COMMAND brew --prefix + OUTPUT_VARIABLE HOMEBREW_PREFIX + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + + if(HOMEBREW_PREFIX AND EXISTS "${HOMEBREW_PREFIX}") + message(STATUS "Using Homebrew prefix: ${HOMEBREW_PREFIX}") + set(CMAKE_INSTALL_PREFIX "${HOMEBREW_PREFIX}" CACHE PATH "Install path" FORCE) + endif() +endif() + set(LIB_SEARCH_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/ucode/*.so:${CMAKE_INSTALL_PREFIX}/share/ucode/*.uc:./*.so:./*.uc" CACHE STRING "Default library search path") +message(STATUS "Using lib search path: ${LIB_SEARCH_PATH}") string(REPLACE ":" "\", \"" LIB_SEARCH_DEFINE "${LIB_SEARCH_PATH}") target_compile_definitions(uc_defines INTERFACE LIB_SEARCH_PATH="${LIB_SEARCH_DEFINE}") @@ -194,20 +209,6 @@ if(APPLE) ) endif() -if(APPLE AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - execute_process( - COMMAND brew --prefix - OUTPUT_VARIABLE HOMEBREW_PREFIX - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_QUIET - ) - - if(HOMEBREW_PREFIX AND EXISTS "${HOMEBREW_PREFIX}") - message(STATUS "Using Homebrew prefix: ${HOMEBREW_PREFIX}") - set(CMAKE_INSTALL_PREFIX "${HOMEBREW_PREFIX}" CACHE PATH "Install path" FORCE) - endif() -endif() - check_function_exists(dlopen DLOPEN_FUNCTION_EXISTS) if(NOT DLOPEN_FUNCTION_EXISTS) target_link_libraries(libucode dl) diff --git a/docs/README.md b/docs/README.md index b79dd417..70645799 100644 --- a/docs/README.md +++ b/docs/README.md @@ -76,7 +76,7 @@ To build on MacOS, first install *cmake*, *json-c* and *libmd* via $ brew install cmake json-c libmd $ git clone https://github.com/ucode-lang/ucode.git $ cd ucode/ - $ cmake -DUBUS_SUPPORT=OFF -DUCI_SUPPORT=OFF -DULOOP_SUPPORT=OFF -DCMAKE_BUILD_RPATH=/usr/local/lib -DCMAKE_INSTALL_RPATH=/usr/local/lib . + $ cmake -DUBUS_SUPPORT=OFF -DUCI_SUPPORT=OFF -DULOOP_SUPPORT=OFF -DCMAKE_BUILD_RPATH=/opt/homebrew/lib -DCMAKE_INSTALL_RPATH=/opt/homebrew/lib . $ make $ sudo make install