diff options
| author | Alex Turbov <i.zaufi@gmail.com> | 2019-12-08 00:39:02 (GMT) |
|---|---|---|
| committer | Alex Turbov <i.zaufi@gmail.com> | 2019-12-10 14:43:27 (GMT) |
| commit | 24fdd51f4503ccee33c07881cc8dd487cdc8b347 (patch) | |
| tree | ff07504a0782e3a79fb996594d9fcbcabf98ecf0 /Modules/AndroidTestUtilities.cmake | |
| parent | 90e3e2a7778dc0ec5b421e9657ec49936a3cf174 (diff) | |
| download | CMake-24fdd51f4503ccee33c07881cc8dd487cdc8b347.zip CMake-24fdd51f4503ccee33c07881cc8dd487cdc8b347.tar.gz CMake-24fdd51f4503ccee33c07881cc8dd487cdc8b347.tar.bz2 | |
Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIR
Some modules define an intermediate global scope visible variables
to access "resource" files from functions.
Now these variables could be eliminated.
Diffstat (limited to 'Modules/AndroidTestUtilities.cmake')
| -rw-r--r-- | Modules/AndroidTestUtilities.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Modules/AndroidTestUtilities.cmake b/Modules/AndroidTestUtilities.cmake index e333cdb..95e2ef7 100644 --- a/Modules/AndroidTestUtilities.cmake +++ b/Modules/AndroidTestUtilities.cmake @@ -76,8 +76,6 @@ Module Functions include(${CMAKE_CURRENT_LIST_DIR}/ExternalData.cmake) -set(_AndroidTestUtilities_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}") - # The parameters to this function should be set to the list of directories, # files, and libraries that need to be installed prior to testing. function(android_add_test_data test_name) @@ -159,6 +157,6 @@ function(android_add_test_data test_name) "-Darg_files=${processed_FILES}" "-Darg_libs=${AST_LIBS}" "-Darg_src_dir=${CMAKE_CURRENT_SOURCE_DIR}" - -P ${_AndroidTestUtilities_SELF_DIR}/AndroidTestUtilities/PushToAndroidDevice.cmake) + -P ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/AndroidTestUtilities/PushToAndroidDevice.cmake) endif() endfunction() |