mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-18 08:51:52 +08:00
UseJava: Move helper scripts to subdirectory
Also, exclude them from the help module index.
This commit is contained in:
@@ -97,9 +97,7 @@ These modules are loaded using the :command:`include` command.
|
|||||||
/module/TestForSSTREAM
|
/module/TestForSSTREAM
|
||||||
/module/TestForSTDNamespace
|
/module/TestForSTDNamespace
|
||||||
/module/UseEcos
|
/module/UseEcos
|
||||||
/module/UseJavaClassFilelist
|
|
||||||
/module/UseJava
|
/module/UseJava
|
||||||
/module/UseJavaSymlinks
|
|
||||||
/module/UseSWIG
|
/module/UseSWIG
|
||||||
/module/UsewxWidgets
|
/module/UsewxWidgets
|
||||||
/module/WriteCompilerDetectionHeader
|
/module/WriteCompilerDetectionHeader
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
.. cmake-module:: ../../Modules/UseJavaClassFilelist.cmake
|
|
@@ -1 +0,0 @@
|
|||||||
.. cmake-module:: ../../Modules/UseJavaSymlinks.cmake
|
|
@@ -406,8 +406,8 @@ function(__java_export_jar VAR TARGET PATH)
|
|||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
# define helper scripts
|
# define helper scripts
|
||||||
set(_JAVA_EXPORT_TARGETS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/javaTargets.cmake.in)
|
set(_JAVA_EXPORT_TARGETS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJava/javaTargets.cmake.in)
|
||||||
set(_JAVA_SYMLINK_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaSymlinks.cmake)
|
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")
|
if (CMAKE_HOST_WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
|
||||||
set(_UseJava_PATH_SEP "$<SEMICOLON>")
|
set(_UseJava_PATH_SEP "$<SEMICOLON>")
|
||||||
@@ -636,7 +636,7 @@ function(add_jar _TARGET_NAME)
|
|||||||
COMMAND ${CMAKE_COMMAND}
|
COMMAND ${CMAKE_COMMAND}
|
||||||
-DCMAKE_JAVA_CLASS_OUTPUT_PATH=${CMAKE_JAVA_CLASS_OUTPUT_PATH}
|
-DCMAKE_JAVA_CLASS_OUTPUT_PATH=${CMAKE_JAVA_CLASS_OUTPUT_PATH}
|
||||||
-DCMAKE_JAR_CLASSES_PREFIX=${CMAKE_JAR_CLASSES_PREFIX}
|
-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}
|
DEPENDS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME}
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
VERBATIM
|
VERBATIM
|
||||||
|
@@ -1,18 +1,9 @@
|
|||||||
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||||
# file Copyright.txt or https://cmake.org/licensing for details.
|
# file Copyright.txt or https://cmake.org/licensing for details.
|
||||||
|
|
||||||
#[=======================================================================[.rst:
|
# This script creates a list of compiled Java class files to be added to
|
||||||
UseJavaClassFilelist
|
# a jar file. This avoids including cmake files which get created in
|
||||||
--------------------
|
# the binary directory.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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.
|
|
||||||
#]=======================================================================]
|
|
||||||
|
|
||||||
if (CMAKE_JAVA_CLASS_OUTPUT_PATH)
|
if (CMAKE_JAVA_CLASS_OUTPUT_PATH)
|
||||||
if (EXISTS "${CMAKE_JAVA_CLASS_OUTPUT_PATH}")
|
if (EXISTS "${CMAKE_JAVA_CLASS_OUTPUT_PATH}")
|
@@ -1,16 +1,7 @@
|
|||||||
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||||
# file Copyright.txt or https://cmake.org/licensing for details.
|
# file Copyright.txt or https://cmake.org/licensing for details.
|
||||||
|
|
||||||
#[=======================================================================[.rst:
|
# Helper script for UseJava.cmake
|
||||||
UseJavaSymlinks
|
|
||||||
---------------
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Helper script for UseJava.cmake
|
|
||||||
#]=======================================================================]
|
|
||||||
|
|
||||||
if (UNIX AND _JAVA_TARGET_OUTPUT_LINK)
|
if (UNIX AND _JAVA_TARGET_OUTPUT_LINK)
|
||||||
if (_JAVA_TARGET_OUTPUT_NAME)
|
if (_JAVA_TARGET_OUTPUT_NAME)
|
Reference in New Issue
Block a user