summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-02-15 13:41:49 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-02-15 13:42:47 (GMT)
commit8bd3e13ec305798c02cb2d4aecb7766fd11b99bb (patch)
tree0ea7d8b5b7a61e4042f42a63a97bbb9a5801ee48 /Tests
parentcbdec57937597c67be8ca138f37c66c9aa7936ff (diff)
parentb6d68766b1a8537a3a130a38aa91936e579da6fd (diff)
downloadCMake-8bd3e13ec305798c02cb2d4aecb7766fd11b99bb.zip
CMake-8bd3e13ec305798c02cb2d4aecb7766fd11b99bb.tar.gz
CMake-8bd3e13ec305798c02cb2d4aecb7766fd11b99bb.tar.bz2
Merge topic 'export-android-mk'
b6d68766 Android.mk: Fix export of static libraries with PRIVATE dependencies 56e16885 Android.mk: Evaluate generator expressions up front Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1766
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/AndroidMK/AndroidMK.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/AndroidMK/AndroidMK.cmake b/Tests/RunCMake/AndroidMK/AndroidMK.cmake
index 2596e8c..3fbb2cf 100644
--- a/Tests/RunCMake/AndroidMK/AndroidMK.cmake
+++ b/Tests/RunCMake/AndroidMK/AndroidMK.cmake
@@ -4,7 +4,7 @@ add_library(foo foo.cxx)
add_library(car foo.cxx)
add_library(bar bar.c)
add_library(dog foo.cxx)
-target_link_libraries(foo car bar dog debug -lm)
+target_link_libraries(foo PRIVATE car bar dog debug -lm)
export(TARGETS bar dog car foo ANDROID_MK
${build_BINARY_DIR}/Android.mk)
install(TARGETS bar dog car foo DESTINATION lib EXPORT myexp)