mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-24 18:23:26 -03:00
Merge d9c8aacce3
into 66aa6a47bd
This commit is contained in:
commit
402f347a82
2 changed files with 2 additions and 3 deletions
|
@ -209,7 +209,6 @@ $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(fina
|
|||
-e 's|@STRIP@|$(host_STRIP)|' \
|
||||
-e 's|@OBJCOPY@|$(host_OBJCOPY)|' \
|
||||
-e 's|@OBJDUMP@|$(host_OBJDUMP)|' \
|
||||
-e 's|@depends_prefix@|$(host_prefix)|' \
|
||||
-e 's|@CFLAGS@|$(strip $(host_CFLAGS))|' \
|
||||
-e 's|@CFLAGS_RELEASE@|$(strip $(host_release_CFLAGS))|' \
|
||||
-e 's|@CFLAGS_DEBUG@|$(strip $(host_debug_CFLAGS))|' \
|
||||
|
|
|
@ -81,12 +81,12 @@ set(CMAKE_OBJDUMP "@OBJDUMP@")
|
|||
# affected by a potentially random environment.
|
||||
set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF)
|
||||
|
||||
set(CMAKE_FIND_ROOT_PATH "@depends_prefix@")
|
||||
set(CMAKE_FIND_ROOT_PATH "${CMAKE_CURRENT_LIST_DIR}")
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
set(QT_TRANSLATIONS_DIR "@depends_prefix@/translations")
|
||||
set(QT_TRANSLATIONS_DIR "${CMAKE_CURRENT_LIST_DIR}/translations")
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT CMAKE_HOST_APPLE)
|
||||
# The find_package(Qt ...) function internally uses find_library()
|
||||
|
|
Loading…
Add table
Reference in a new issue