diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/FindGpgme.cmake | 29 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | src/test/CMakeLists.txt | 2 |
4 files changed, 33 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b9e87ce0..5c6335b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -291,9 +291,11 @@ if (APPLE) ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/third_party /usr/local/include + /opt/homebrew/include ) link_directories( /usr/local/lib + /opt/homebrew/lib ) endif () diff --git a/cmake/FindGpgme.cmake b/cmake/FindGpgme.cmake index 7e616456..d3987d0e 100644 --- a/cmake/FindGpgme.cmake +++ b/cmake/FindGpgme.cmake @@ -197,7 +197,7 @@ else() # not WIN32 message( STATUS "Found gpgme-config at ${_GPGMECONFIG_EXECUTABLE}" ) - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION ) + execute_process(COMMAND ${_GPGMECONFIG_EXECUTABLE} --version OUTPUT_VARIABLE GPGME_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) set( _GPGME_MIN_VERSION "1.4.3" ) @@ -209,38 +209,33 @@ else() # not WIN32 message( STATUS "Found gpgme v${GPGME_VERSION}, checking for flavors..." ) - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret ) + execute_process(COMMAND ${_GPGMECONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE _gpgme_config_vanilla_libs RESULT_VARIABLE _ret OUTPUT_STRIP_TRAILING_WHITESPACE) if ( _ret ) set( _gpgme_config_vanilla_libs ) endif() - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret ) + execute_process(COMMAND ${_GPGMECONFIG_EXECUTABLE} --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RESULT_VARIABLE _ret OUTPUT_STRIP_TRAILING_WHITESPACE) if ( _ret ) set( _gpgme_config_pthread_libs ) endif() - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth --libs OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret ) - if ( _ret ) - set( _gpgme_config_pth_libs ) - endif() - # append -lgpg-error to the list of libraries, if necessary - foreach ( _flavour vanilla pthread pth ) - if ( _gpgme_config_${_flavour}_libs AND NOT _gpgme_config_${_flavour}_libs MATCHES "lgpg-error" ) + foreach ( _flavour vanilla pthread ) + if ( _gpgme_config_${_flavour}_libs AND NOT _gpgme_config_${_flavour}_libs MATCHES "lgpg-error") set( _gpgme_config_${_flavour}_libs "${_gpgme_config_${_flavour}_libs} -lgpg-error" ) endif() endforeach() - if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR _gpgme_config_pth_libs ) + if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs ) - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _GPGME_CFLAGS ) + execute_process(COMMAND ${_GPGMECONFIG_EXECUTABLE} --cflags OUTPUT_VARIABLE _GPGME_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) if ( _GPGME_CFLAGS ) string( REGEX REPLACE "(\r?\n)+$" " " _GPGME_CFLAGS "${_GPGME_CFLAGS}" ) string( REGEX REPLACE " *-I" ";" GPGME_INCLUDES "${_GPGME_CFLAGS}" ) endif() - foreach ( _flavour vanilla pthread pth ) + foreach ( _flavour vanilla pthread ) if ( _gpgme_config_${_flavour}_libs ) set( _gpgme_library_dirs ) @@ -283,7 +278,7 @@ else() # not WIN32 endif() endif() - set( GPGME_${_FLAVOUR}_LIBRARIES ${GPGME_${_FLAVOUR}_LIBRARIES} "${_gpgme_${_name}_lib}" ) + set( _gpgme_${_flavour}_lib ${_gpgme_${_flavour}_lib} "${_gpgme_${_name}_lib}" ) endforeach() #check_c_library_exists_explicit( gpgme gpgme_check_version "${_GPGME_CFLAGS}" "${GPGME_LIBRARIES}" GPGME_FOUND ) @@ -421,10 +416,10 @@ endif() if(NOT GPGME_LIBRARIES) # determine the library in one of the found flavors, can be reused e.g. by FindQgpgme.cmake, Alex set(GPGME_LIBRARIES "") - foreach(_currentFlavour vanilla glib qt pth pthread) + foreach(_current_flavour vanilla glib qt pth pthread) if(NOT GPGME_LIBRARY_DIR) - get_filename_component(GPGME_LIBRARY_DIR "${_gpgme_${_currentFlavour}_lib}" PATH) - list(APPEND GPGME_LIBRARIES "${_gpgme_${_currentFlavour}_lib}") + get_filename_component(GPGME_LIBRARY_DIR "${_gpgme_${_current_flavour}_lib}" PATH) + list(APPEND GPGME_LIBRARIES "${_gpgme_${_current_flavour}_lib}") endif() endforeach() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b0b704d1..db8ee2db 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -45,7 +45,24 @@ find_package(Config++ REQUIRED) # Introduce OpenSSL if (APPLE) - set(OPENSSL_ROOT_DIR /usr/local/opt/openssl@3) + # Define possible OpenSSL directories + set(OPENSSL_DIR_CANDIDATES + /usr/local/opt/openssl@3 + /opt/homebrew/opt/openssl@3 + ) + + # Find the valid OpenSSL directory + foreach(DIR IN LISTS OPENSSL_DIR_CANDIDATES) + if(IS_DIRECTORY "${DIR}" OR EXISTS "${DIR}") + set(OPENSSL_ROOT_DIR "${DIR}") + break() # Stop loop once a valid directory is found + endif() + endforeach() + + # If not found, throw an error or warning + if(NOT OPENSSL_ROOT_DIR) + message(FATAL_ERROR "OpenSSL not found in the standard directories. Please install it or set OPENSSL_ROOT_DIR manually.") + endif() endif() find_package(OpenSSL REQUIRED) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 1eb710be..2c99c5d3 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -40,7 +40,7 @@ target_link_libraries(gpgfrontend_test PRIVATE gpgfrontend_core) target_link_libraries(gpgfrontend_test PRIVATE spdlog) if (APPLE) - target_link_libraries(gpgfrontend_test intl) + target_link_libraries(gpgfrontend_test PRIVATE intl) endif () add_test(AllTestsInGpgFrontend gpgfrontend_test) |