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

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
This commit is contained in:
Brad King 2014-02-10 11:24:58 -05:00 committed by CMake Topic Stage
parent 27d3974c66 4b7f2f5213
commit f67ab2a920
6 changed files with 11 additions and 91976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5301
ChangeLog.manual
View File

File diff suppressed because it is too large Load Diff

86670
ChangeLog.txt
View File

File diff suppressed because it is too large Load Diff

6
Help/manual/cmake-language.7.rst
View File

@ -140,6 +140,8 @@ There are three types of arguments within `Command Invocations`_:
.. productionlist:: .. productionlist::
argument: `bracket_argument` | `quoted_argument` | `unquoted_argument` argument: `bracket_argument` | `quoted_argument` | `unquoted_argument`
.. _`Bracket Argument`:
Bracket Argument Bracket Argument
^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^
@ -187,6 +189,8 @@ For example:
.. _`Lua`: http://www.lua.org/ .. _`Lua`: http://www.lua.org/
.. _`Quoted Argument`:
Quoted Argument Quoted Argument
^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^
@ -233,6 +237,8 @@ immediately following newline character. For example:
They report errors in quoted arguments containing lines ending in They report errors in quoted arguments containing lines ending in
an odd number of ``\`` characters. an odd number of ``\`` characters.
.. _`Unquoted Argument`:
Unquoted Argument Unquoted Argument
^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^

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)