diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-12-13 10:57:32 +0200 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-12-13 11:00:26 +0200 |
commit | 806a3ce4d56c85d80b7d050c052caa1abbf1bd40 (patch) | |
tree | e241d5b38dc88945406417e1f23adcf76af0917a /Resources.cmake | |
parent | 0de61990141bdecd198b621875114cdbf2e1fa44 (diff) |
Android: Updated CMake project to work as a subdirectory
Android builds produce a static library instead of a regular executable.
Diffstat (limited to 'Resources.cmake')
-rw-r--r-- | Resources.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Resources.cmake b/Resources.cmake index fc5d20c6..15ef15ea 100644 --- a/Resources.cmake +++ b/Resources.cmake | |||
@@ -16,11 +16,11 @@ function (make_resources dst) | |||
16 | file (REMOVE ${dst}) | 16 | file (REMOVE ${dst}) |
17 | get_filename_component (dstName ${dst} NAME) | 17 | get_filename_component (dstName ${dst} NAME) |
18 | message (STATUS " ${dstName}") | 18 | message (STATUS " ${dstName}") |
19 | set (versionTempPath ${CMAKE_SOURCE_DIR}/res/VERSION) | 19 | set (versionTempPath ${CMAKE_CURRENT_SOURCE_DIR}/res/VERSION) |
20 | file (WRITE ${versionTempPath} ${PROJECT_VERSION}) | 20 | file (WRITE ${versionTempPath} ${PROJECT_VERSION}) |
21 | execute_process ( | 21 | execute_process ( |
22 | COMMAND ${ZIP_EXECUTABLE} -1 ${dst} VERSION ${files} | 22 | COMMAND ${ZIP_EXECUTABLE} -1 ${dst} VERSION ${files} |
23 | WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/res | 23 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res |
24 | OUTPUT_QUIET | 24 | OUTPUT_QUIET |
25 | ) | 25 | ) |
26 | file (REMOVE ${versionTempPath}) | 26 | file (REMOVE ${versionTempPath}) |