summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Chevrier <marc.chevrier@gmail.com>2021-05-31 15:14:30 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-05-31 15:14:41 (GMT)
commit7124a582c775b7d57417ba229bcf9be881fb4904 (patch)
tree21d11cabd178f279497345237441cafe9a52a334
parent7ed2a1a66ff3a44857e24748806fdd74e5a886cc (diff)
parenta42add6cd6673c573e5f5257b55421a1d077befd (diff)
downloadCMake-7124a582c775b7d57417ba229bcf9be881fb4904.zip
CMake-7124a582c775b7d57417ba229bcf9be881fb4904.tar.gz
CMake-7124a582c775b7d57417ba229bcf9be881fb4904.tar.bz2
Merge topic 'UseJava-update-doc'
a42add6cd6 UseJava: Add version for RESOURCES option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6178
-rw-r--r--Modules/UseJava.cmake12
1 files changed, 8 insertions, 4 deletions
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index baed7ef..30b40a0 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -34,9 +34,12 @@ the jar file. Source files can be java files or listing files
(prefixed by ``@``). If only resource files are given then just a jar file
is created.
-The ``RESOURCES`` parameter adds the named ``<resource>`` files to the jar
-by stripping the source file path and placing the file beneath ``<ns>``
-within the jar. For example::
+.. versionadded:: 3.21
+ The ``RESOURCES`` parameter adds the named ``<resource>`` files to the jar
+ by stripping the source file path and placing the file beneath ``<ns>``
+ within the jar.
+
+For example::
RESOURCES NAMESPACE "/com/my/namespace" "a/path/to/resource.txt"
@@ -49,7 +52,8 @@ paths must be relative to ``CMAKE_CURRENT_SOURCE_DIR``. Adding resources
without using the ``RESOURCES`` parameter in out of source builds will
almost certainly result in confusion.
-.. note:: SOURCES
+.. note::
+
Adding resources via the ``SOURCES`` parameter relies upon a hard-coded
list of file extensions which are tested to determine whether they compile
(e.g. File.java). ``SOURCES`` files which match the extensions are compiled.