diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2016-11-26 19:13:50 (GMT) |
|---|---|---|
| committer | Domen Vrankar <domen.vrankar@gmail.com> | 2016-11-27 22:20:35 (GMT) |
| commit | 79443e1b8b604de00d269e73a977f449bc3fcef2 (patch) | |
| tree | ca960e26a1282ca38a6d29ecbc862f97a86e3ae0 | |
| parent | 6d51bea4e6ff058383e63c215ec5fb7fcab9870c (diff) | |
| download | CMake-79443e1b8b604de00d269e73a977f449bc3fcef2.zip CMake-79443e1b8b604de00d269e73a977f449bc3fcef2.tar.gz CMake-79443e1b8b604de00d269e73a977f449bc3fcef2.tar.bz2 | |
Tests: CPack test move per test prerequirements
Move per test prerequirements into the
belonging test.
| -rw-r--r-- | Tests/RunCMake/CPack/CPackTestHelpers.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS/DEB-Prerequirements.cmake (renamed from Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-Prerequirements.cmake) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS_LDCONFIG/DEB-Prerequirements.cmake (renamed from Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-Prerequirements.cmake) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/tests/LONG_FILENAMES/DEB-Prerequirements.cmake (renamed from Tests/RunCMake/CPack/DEB/LONG_FILENAMES-Prerequirements.cmake) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake b/Tests/RunCMake/CPack/CPackTestHelpers.cmake index 94be2f9..3d80cc6 100644 --- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake +++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake @@ -15,8 +15,8 @@ function(run_cpack_test_common_ TEST_NAME types build SUBTEST_SUFFIX source) file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") - if(EXISTS "${RunCMake_SOURCE_DIR}/${TEST_TYPE}/${TEST_NAME}-Prerequirements.cmake") - include("${RunCMake_SOURCE_DIR}/${TEST_TYPE}/${TEST_NAME}-Prerequirements.cmake") + if(EXISTS "${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-Prerequirements.cmake") + include("${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-Prerequirements.cmake") set(FOUND_PREREQUIREMENTS false) get_test_prerequirements("FOUND_PREREQUIREMENTS" "${config_file}") diff --git a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-Prerequirements.cmake b/Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS/DEB-Prerequirements.cmake index b98065a..b98065a 100644 --- a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-Prerequirements.cmake +++ b/Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS/DEB-Prerequirements.cmake diff --git a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-Prerequirements.cmake b/Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS_LDCONFIG/DEB-Prerequirements.cmake index b98065a..b98065a 100644 --- a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-Prerequirements.cmake +++ b/Tests/RunCMake/CPack/tests/DEB_GENERATE_SHLIBS_LDCONFIG/DEB-Prerequirements.cmake diff --git a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-Prerequirements.cmake b/Tests/RunCMake/CPack/tests/LONG_FILENAMES/DEB-Prerequirements.cmake index 0c1d77e..0c1d77e 100644 --- a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-Prerequirements.cmake +++ b/Tests/RunCMake/CPack/tests/LONG_FILENAMES/DEB-Prerequirements.cmake |