summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2018-01-12 02:43:42 +0100
committerArne Schwabe <arne@rfc2549.org>2018-01-12 03:03:14 +0100
commit31d1b7966206eae13075785216ff0ed58dc94fb6 (patch)
tree85340941a317792c9917b4f1ad29053b4b8943bf /main
parentfa7eae752dd1ac2ef437f4cb19ed9a79ae93418e (diff)
DEPENDS on custom command does not seem to work with ninja, add it as depency to the target the custom command belongs to
Diffstat (limited to 'main')
-rw-r--r--main/src/main/cpp/CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 85b3403b..78cc0a39 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -177,14 +177,16 @@ add_custom_command(TARGET nopie_openvpn.${ANDROID_ABI} POST_BUILD
${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_BINARY_DIR}/nopie_openvpn.${ANDROID_ABI}
${OVPN_ASSET_DIR}
- DEPENDS makeassetdir)
+)
add_custom_command(TARGET pie_openvpn.${ANDROID_ABI} POST_BUILD
COMMAND
${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_BINARY_DIR}/pie_openvpn.${ANDROID_ABI}
${OVPN_ASSET_DIR}
- DEPENDS makeassetdir)
+)
# Hack that these targets are really executed
add_dependencies(opvpnutil pie_openvpn.${ANDROID_ABI} nopie_openvpn.${ANDROID_ABI})
+add_dependencies(pie_openvpn.${ANDROID_ABI} makeassetdir)
+add_dependencies(nopie_openvpn.${ANDROID_ABI} makeassetdir)