diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-13 14:48:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-13 14:48:56 (GMT) |
| commit | 225fb10f67afe474e017e6b9b2a53e239f004ec8 (patch) | |
| tree | 0e05008d3d5553c3b8c0fc226262ff91940ab66c /Modules | |
| parent | d06676ebeefe147fb4fe22ad961d7cdf515ad928 (diff) | |
| parent | cb28d9af1ff3f01c7b1e63f819cbe67723110fe2 (diff) | |
| download | CMake-225fb10f67afe474e017e6b9b2a53e239f004ec8.zip CMake-225fb10f67afe474e017e6b9b2a53e239f004ec8.tar.gz CMake-225fb10f67afe474e017e6b9b2a53e239f004ec8.tar.bz2 | |
Merge topic 'usejava_helpers'
cb28d9af1f UseJava: Move helper scripts to subdirectory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5501
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/UseJava.cmake | 6 | ||||
| -rw-r--r-- | Modules/UseJava/ClassFilelist.cmake (renamed from Modules/UseJavaClassFilelist.cmake) | 15 | ||||
| -rw-r--r-- | Modules/UseJava/Symlinks.cmake (renamed from Modules/UseJavaSymlinks.cmake) | 11 | ||||
| -rw-r--r-- | Modules/UseJava/javaTargets.cmake.in (renamed from Modules/javaTargets.cmake.in) | 0 |
4 files changed, 7 insertions, 25 deletions
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index db3fb95..bbd469e 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -406,8 +406,8 @@ function(__java_export_jar VAR TARGET PATH) endfunction() # define helper scripts -set(_JAVA_EXPORT_TARGETS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/javaTargets.cmake.in) -set(_JAVA_SYMLINK_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaSymlinks.cmake) +set(_JAVA_EXPORT_TARGETS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJava/javaTargets.cmake.in) +set(_JAVA_SYMLINK_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJava/Symlinks.cmake) if (CMAKE_HOST_WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") set(_UseJava_PATH_SEP "$<SEMICOLON>") @@ -636,7 +636,7 @@ function(add_jar _TARGET_NAME) COMMAND ${CMAKE_COMMAND} -DCMAKE_JAVA_CLASS_OUTPUT_PATH=${CMAKE_JAVA_CLASS_OUTPUT_PATH} -DCMAKE_JAR_CLASSES_PREFIX=${CMAKE_JAR_CLASSES_PREFIX} - -P ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/UseJavaClassFilelist.cmake + -P ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/UseJava/ClassFilelist.cmake DEPENDS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM diff --git a/Modules/UseJavaClassFilelist.cmake b/Modules/UseJava/ClassFilelist.cmake index 1c4baa9..aa9e35d 100644 --- a/Modules/UseJavaClassFilelist.cmake +++ b/Modules/UseJava/ClassFilelist.cmake @@ -1,18 +1,9 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -#[=======================================================================[.rst: -UseJavaClassFilelist --------------------- - - - - - -This script create a list of compiled Java class files to be added to -a jar file. This avoids including cmake files which get created in -the binary directory. -#]=======================================================================] +# This script creates a list of compiled Java class files to be added to +# a jar file. This avoids including cmake files which get created in +# the binary directory. if (CMAKE_JAVA_CLASS_OUTPUT_PATH) if (EXISTS "${CMAKE_JAVA_CLASS_OUTPUT_PATH}") diff --git a/Modules/UseJavaSymlinks.cmake b/Modules/UseJava/Symlinks.cmake index 3969f54..2788195 100644 --- a/Modules/UseJavaSymlinks.cmake +++ b/Modules/UseJava/Symlinks.cmake @@ -1,16 +1,7 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -#[=======================================================================[.rst: -UseJavaSymlinks ---------------- - - - - - -Helper script for UseJava.cmake -#]=======================================================================] +# Helper script for UseJava.cmake if (UNIX AND _JAVA_TARGET_OUTPUT_LINK) if (_JAVA_TARGET_OUTPUT_NAME) diff --git a/Modules/javaTargets.cmake.in b/Modules/UseJava/javaTargets.cmake.in index c5f9c78..c5f9c78 100644 --- a/Modules/javaTargets.cmake.in +++ b/Modules/UseJava/javaTargets.cmake.in |