mirror of
https://github.com/oxen-io/oxen-core.git
synced 2023-12-14 02:22:56 +01:00
Remove BUILD_GUI_DEPS, enable FORCE_USE_HEAP on android
BUILD_GUI_DEPS was dumb: it should have just been a non-"all" target (as it is now) that can be explicitly built, rather than misusing a cmake option. It was doing one useful thing, however, of turning on FORCE_USE_HEAP -- but that was wrong too, because that needs to be enabled when doing an android build (and probably IOS as well).
This commit is contained in:
parent
6cf17d4d28
commit
1127ac51fd
4 changed files with 4 additions and 9 deletions
|
@ -746,7 +746,7 @@ else()
|
|||
|
||||
endif(ARM)
|
||||
|
||||
if(ANDROID AND NOT BUILD_GUI_DEPS STREQUAL "ON" OR IOS)
|
||||
if(ANDROID OR IOS)
|
||||
#From Android 5: "only position independent executables (PIE) are supported"
|
||||
message(STATUS "Enabling PIE executable")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
|
||||
|
@ -949,9 +949,6 @@ if(BUILD_DOCUMENTATION)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
# when ON - will install libwallet_merged into "lib"
|
||||
option(BUILD_GUI_DEPS "Build GUI dependencies." OFF)
|
||||
|
||||
find_package(PythonInterp)
|
||||
find_program(iwyu_tool_path NAMES iwyu_tool.py iwyu_tool)
|
||||
if (iwyu_tool_path AND PYTHONINTERP_FOUND)
|
||||
|
|
|
@ -146,7 +146,7 @@ if(Protobuf_FOUND AND USE_DEVICE_TREZOR AND TREZOR_PYTHON AND Protobuf_COMPILE_T
|
|||
message(STATUS "Trezor compatible LibUSB found")
|
||||
endif()
|
||||
|
||||
if (BUILD_GUI_DEPS)
|
||||
if (ANDROID)
|
||||
|
||||
if (Protobuf_LIBRARY)
|
||||
list(APPEND TREZOR_DEP_LIBS ${Protobuf_LIBRARY})
|
||||
|
|
|
@ -94,8 +94,6 @@ endif()
|
|||
# So this code runs with a 1 MB default stack size.
|
||||
# This will force the use of the heap for the allocation of the scratchpad
|
||||
if (ANDROID OR IOS)
|
||||
if( BUILD_GUI_DEPS )
|
||||
target_compile_definitions(cncrypto PUBLIC FORCE_USE_HEAP=1)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@ add_subdirectory(block_weight)
|
|||
add_subdirectory(hash)
|
||||
add_subdirectory(net_load_tests)
|
||||
add_subdirectory(network_tests)
|
||||
if (BUILD_GUI_DEPS)
|
||||
if (ANDROID)
|
||||
# Currently failed to compile
|
||||
# add_subdirectory(libwallet_api_tests)
|
||||
endif()
|
||||
|
|
Loading…
Reference in a new issue