kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests/BundleTest: Drop use of ChangeLog.txt 

The test just wants a source file from outside its tree.
Use README.rst instead.
This commit is contained in:
Brad King 2014-02-07 13:34:33 -05:00
parent 6abdc6c16a
commit d25dbc9059
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/BundleTest/BundleLib.cxx
View File

@ -58,7 +58,7 @@ int foo(char *exec)
int res1 = findBundleFile(exec, "Resources/randomResourceFile.plist"); int res1 = findBundleFile(exec, "Resources/randomResourceFile.plist");
int res2 = findBundleFile(exec, "MacOS/SomeRandomFile.txt"); int res2 = findBundleFile(exec, "MacOS/SomeRandomFile.txt");
int res3 = findBundleFile(exec, "MacOS/ChangeLog.txt"); int res3 = findBundleFile(exec, "MacOS/README.rst");
if ( !res1 || if ( !res1 ||
!res2 || !res2 ||
!res3 ) !res3 )

4
Tests/BundleTest/BundleSubDir/CMakeLists.txt
View File

@ -12,7 +12,7 @@ set_source_files_properties(
set_source_files_properties( set_source_files_properties(
"${BundleTest_SOURCE_DIR}/SomeRandomFile.txt" "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt"
"${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" "${BundleTest_SOURCE_DIR}/../../README.rst"
PROPERTIES PROPERTIES
MACOSX_PACKAGE_LOCATION MacOS MACOSX_PACKAGE_LOCATION MacOS
) )
@ -21,7 +21,7 @@ add_executable(SecondBundle
MACOSX_BUNDLE MACOSX_BUNDLE
"${BundleTest_SOURCE_DIR}/BundleTest.cxx" "${BundleTest_SOURCE_DIR}/BundleTest.cxx"
"${BundleTest_SOURCE_DIR}/SomeRandomFile.txt" "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt"
"${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" "${BundleTest_SOURCE_DIR}/../../README.rst"
"${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist" "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist"
) )
target_link_libraries(SecondBundle BundleTestLib) target_link_libraries(SecondBundle BundleTestLib)

4
Tests/BundleTest/CMakeLists.txt
View File

@ -17,7 +17,7 @@ set_source_files_properties(
set_source_files_properties( set_source_files_properties(
SomeRandomFile.txt SomeRandomFile.txt
"${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" "${BundleTest_SOURCE_DIR}/../../README.rst"
PROPERTIES PROPERTIES
MACOSX_PACKAGE_LOCATION MacOS MACOSX_PACKAGE_LOCATION MacOS
) )
@ -38,7 +38,7 @@ add_executable(BundleTest
MACOSX_BUNDLE MACOSX_BUNDLE
BundleTest.cxx BundleTest.cxx
SomeRandomFile.txt SomeRandomFile.txt
"${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" "${BundleTest_SOURCE_DIR}/../../README.rst"
"${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist" "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist"
) )
target_link_libraries(BundleTest BundleTestLib) target_link_libraries(BundleTest BundleTestLib)