diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-10 16:24:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-10 16:24:58 (GMT) |
| commit | f67ab2a920cfce8db31ce214a198670cab31470a (patch) | |
| tree | c6b072629ec7364c876cc49deea8565e36fba8ef /Tests | |
| parent | 27d3974c66f42f1f37fb60d0e07cd9dd2ee912cf (diff) | |
| parent | 4b7f2f521356e7029c3d944c061c4c94959efe52 (diff) | |
| download | CMake-f67ab2a920cfce8db31ce214a198670cab31470a.zip CMake-f67ab2a920cfce8db31ce214a198670cab31470a.tar.gz CMake-f67ab2a920cfce8db31ce214a198670cab31470a.tar.bz2 | |
Merge topic 'release-notes-prep'
4b7f2f52 Help: Add hyperlink targets for argument types in cmake-language(7)
113df227 Remove ChangeLog.manual
79f55909 Remove ChangeLog.txt
d25dbc90 Tests/BundleTest: Drop use of ChangeLog.txt
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/BundleTest/BundleLib.cxx | 2 | ||||
| -rw-r--r-- | Tests/BundleTest/BundleSubDir/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | 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 b68ee25..37bc178 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 1921ce0..43c366a 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 de69d75..853da35 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) |