mirror of
https://github.com/transmission/transmission.git
synced 2025-12-20 02:18:42 +00:00
TrMacros: Move common & android vars
This commit is contained in:
@@ -159,6 +159,13 @@ macro(tr_add_external_auto_library ID DIRNAME LIBNAME)
|
||||
set(${ID}_LIBRARIES ${${ID}_LIBRARY})
|
||||
|
||||
set(${ID}_EXT_PROJ_CMAKE_ARGS)
|
||||
|
||||
list(APPEND ${ID}_EXT_PROJ_CMAKE_ARGS
|
||||
"-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}"
|
||||
"-DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION}"
|
||||
"-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}"
|
||||
"-DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}")
|
||||
|
||||
if(APPLE)
|
||||
string(REPLACE ";" "$<SEMICOLON>" ${ID}_CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
|
||||
list(APPEND ${ID}_EXT_PROJ_CMAKE_ARGS
|
||||
@@ -167,6 +174,16 @@ macro(tr_add_external_auto_library ID DIRNAME LIBNAME)
|
||||
"-DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}")
|
||||
endif()
|
||||
|
||||
if(ANDROID)
|
||||
list(APPEND ${ID}_EXT_PROJ_CMAKE_ARGS
|
||||
"-DANDROID_PLATFORM=${ANDROID_PLATFORM}"
|
||||
"-DANDROID_NDK=${ANDROID_NDK}"
|
||||
"-DANDROID_ABI=${ANDROID_ABI}"
|
||||
"-DANDROID_STL=${ANDROID_STL}"
|
||||
"-DCMAKE_ANDROID_NDK=${CMAKE_ANDROID_NDK}"
|
||||
"-DCMAKE_ANDROID_ARCH_ABI=${CMAKE_ANDROID_ARCH_ABI}")
|
||||
endif()
|
||||
|
||||
ExternalProject_Add(
|
||||
${${ID}_UPSTREAM_TARGET}
|
||||
PREFIX "${TR_THIRD_PARTY_BINARY_DIR}/${DIRNAME}.bld"
|
||||
|
||||
Reference in New Issue
Block a user