Android/CMakeLists: Remove usages of LIBS and SRCS variables
Instead, operate on the target itself.
This commit is contained in:
parent
4331f80489
commit
21ee216e63
|
@ -1,17 +1,21 @@
|
||||||
list(APPEND LIBS core uicommon)
|
add_library(main SHARED
|
||||||
|
ButtonManager.cpp
|
||||||
|
MainAndroid.cpp
|
||||||
|
)
|
||||||
|
|
||||||
set(SRCS ButtonManager.cpp
|
target_link_libraries(main
|
||||||
MainAndroid.cpp)
|
PRIVATE
|
||||||
|
core
|
||||||
|
uicommon
|
||||||
|
)
|
||||||
|
|
||||||
set(SHARED_LIB main)
|
target_link_libraries(main
|
||||||
add_library(${SHARED_LIB} SHARED ${SRCS})
|
PRIVATE
|
||||||
target_link_libraries(${SHARED_LIB}
|
android
|
||||||
log
|
log
|
||||||
android
|
"-Wl,--no-warn-mismatch"
|
||||||
"-Wl,--no-warn-mismatch"
|
"-Wl,--whole-archive"
|
||||||
"-Wl,--whole-archive"
|
"-Wl,--no-whole-archive"
|
||||||
${LIBS}
|
|
||||||
"-Wl,--no-whole-archive"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/)
|
file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/)
|
||||||
|
@ -19,4 +23,4 @@ file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/)
|
||||||
file(COPY ${CMAKE_SOURCE_DIR}/Data/Sys DESTINATION ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/)
|
file(COPY ${CMAKE_SOURCE_DIR}/Data/Sys DESTINATION ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/)
|
||||||
file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/Resources/) # not used on Android
|
file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/Resources/) # not used on Android
|
||||||
|
|
||||||
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${SHARED_LIB})
|
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} main)
|
||||||
|
|
Loading…
Reference in New Issue