From d25dbc9059b9058b69a1b1380aa55df0e634d520 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 7 Feb 2014 13:34:33 -0500 Subject: [PATCH] Tests/BundleTest: Drop use of ChangeLog.txt The test just wants a source file from outside its tree. Use README.rst instead. --- Tests/BundleTest/BundleLib.cxx | 2 +- Tests/BundleTest/BundleSubDir/CMakeLists.txt | 4 ++-- Tests/BundleTest/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx index b68ee25dd..37bc178d6 100644 --- a/Tests/BundleTest/BundleLib.cxx +++ b/Tests/BundleTest/BundleLib.cxx @@ -58,7 +58,7 @@ int foo(char *exec) int res1 = findBundleFile(exec, "Resources/randomResourceFile.plist"); int res2 = findBundleFile(exec, "MacOS/SomeRandomFile.txt"); - int res3 = findBundleFile(exec, "MacOS/ChangeLog.txt"); + int res3 = findBundleFile(exec, "MacOS/README.rst"); if ( !res1 || !res2 || !res3 ) diff --git a/Tests/BundleTest/BundleSubDir/CMakeLists.txt b/Tests/BundleTest/BundleSubDir/CMakeLists.txt index 1921ce095..43c366a09 100644 --- a/Tests/BundleTest/BundleSubDir/CMakeLists.txt +++ b/Tests/BundleTest/BundleSubDir/CMakeLists.txt @@ -12,7 +12,7 @@ set_source_files_properties( set_source_files_properties( "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt" - "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../README.rst" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS ) @@ -21,7 +21,7 @@ add_executable(SecondBundle MACOSX_BUNDLE "${BundleTest_SOURCE_DIR}/BundleTest.cxx" "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt" - "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../README.rst" "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist" ) target_link_libraries(SecondBundle BundleTestLib) diff --git a/Tests/BundleTest/CMakeLists.txt b/Tests/BundleTest/CMakeLists.txt index de69d7555..853da3538 100644 --- a/Tests/BundleTest/CMakeLists.txt +++ b/Tests/BundleTest/CMakeLists.txt @@ -17,7 +17,7 @@ set_source_files_properties( set_source_files_properties( SomeRandomFile.txt - "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../README.rst" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS ) @@ -38,7 +38,7 @@ add_executable(BundleTest MACOSX_BUNDLE BundleTest.cxx SomeRandomFile.txt - "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../README.rst" "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist" ) target_link_libraries(BundleTest BundleTestLib)