summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-06-17 09:12:24 (GMT)
committerBrad King <brad.king@kitware.com>2011-06-20 14:00:11 (GMT)
commit0b7627df0a6c5e81c8f867bf4853968b85ccfb28 (patch)
tree72918b81a2eb80ac861f9f05c701fbf4dd402d22 /Modules
parentb01a50567a7ca190e9f39aa2db5f4b0042e9ca4c (diff)
downloadCMake-0b7627df0a6c5e81c8f867bf4853968b85ccfb28.zip
CMake-0b7627df0a6c5e81c8f867bf4853968b85ccfb28.tar.gz
CMake-0b7627df0a6c5e81c8f867bf4853968b85ccfb28.tar.bz2
Java: Use set_property/get_property for target variables.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/UseJava.cmake114
1 files changed, 77 insertions, 37 deletions
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 3723f2e..587bbbb 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -55,20 +55,20 @@
# set(CMAKE_JAR_CLASSES_PREFIX com/redhat/bar)
# add_jar(bar bar.java)
#
-# Variables set:
-# The add_jar() functions sets some variables which can be used in the
-# same scope where add_jar() is called.
-#
-# <target>_INSTALL_FILES The files which should be installed. This
-# is used by install_jar().
-# <target>_JNI_SYMLINK The JNI symlink which should be
-# installed.
-# This is used by install_jni_symlink().
-# <target>_JAR_FILE The location of the jar file so that you
-# can include it.
-# <target>_CLASS_DIR The directory where the class files can
-# be found. For example to use them with
-# javah.
+# Target Properties:
+# The add_jar() functions sets some target properties. You can get these
+# properties with the
+# get_property(TARGET <target_name> PROPERTY <propery_name>)
+# command.
+#
+# INSTALL_FILES The files which should be installed. This is used by
+# install_jar().
+# JNI_SYMLINK The JNI symlink which should be installed.
+# This is used by install_jni_symlink().
+# JAR_FILE The location of the jar file so that you can include
+# it.
+# CLASS_DIR The directory where the class files can be found. For
+# example to use them with javah.
#
# find_jar(
# <VAR>
@@ -356,51 +356,91 @@ function(add_jar _TARGET_NAME)
# Add the target and make sure we have the latest resource files.
add_custom_target(${_TARGET_NAME} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME})
- set(${_TARGET_NAME}_INSTALL_FILES
- ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
- PARENT_SCOPE)
+ set_property(
+ TARGET
+ ${_TARGET_NAME}
+ PROPERTY
+ INSTALL_FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
+ )
+
if (_JAVA_TARGET_OUTPUT_LINK)
- set(${_TARGET_NAME}_INSTALL_FILES
- ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
- ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_LINK}
- PARENT_SCOPE)
+ set_property(
+ TARGET
+ ${_TARGET_NAME}
+ PROPERTY
+ INSTALL_FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
+ ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_LINK}
+ )
+
if (CMAKE_JNI_TARGET)
- set(${_TARGET_NAME}_JNI_SYMLINK
- ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_LINK}
- PARENT_SCOPE)
+ set_property(
+ TARGET
+ ${_TARGET_NAME}
+ PROPERTY
+ JNI_SYMLINK
+ ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_LINK}
+ )
endif (CMAKE_JNI_TARGET)
endif (_JAVA_TARGET_OUTPUT_LINK)
- set(${_TARGET_NAME}_JAR_FILE
- ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME} PARENT_SCOPE)
- set(${_TARGET_NAME}_CLASS_DIR
- ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
- PARENT_SCOPE)
+
+ set_property(
+ TARGET
+ ${_TARGET_NAME}
+ PROPERTY
+ JAR_FILE
+ ${CMAKE_CURRENT_BINARY_DIR}/${_JAVA_TARGET_OUTPUT_NAME}
+ )
+
+ set_property(
+ TARGET
+ ${_TARGET_NAME}
+ PROPERTY
+ CLASSDIR
+ ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
+ )
+
endfunction(add_jar)
function(INSTALL_JAR _TARGET_NAME _DESTINATION)
- if (${_TARGET_NAME}_INSTALL_FILES)
+ get_property(__FILES
+ TARGET
+ ${_TARGET_NAME}
+ PROPERTY
+ INSTALL_FILES
+ )
+
+ if (__FILES)
install(
FILES
- ${${_TARGET_NAME}_INSTALL_FILES}
+ ${__FILES}
DESTINATION
${_DESTINATION}
)
- else (${_TARGET_NAME}_INSTALL_FILES)
+ else (__FILES)
message(SEND_ERROR "The target ${_TARGET_NAME} is not known in this scope.")
- endif (${_TARGET_NAME}_INSTALL_FILES)
+ endif (__FILES)
endfunction(INSTALL_JAR _TARGET_NAME _DESTINATION)
function(INSTALL_JNI_SYMLINK _TARGET_NAME _DESTINATION)
- if (${_TARGET_NAME}_JNI_SYMLINK)
+ get_property(__SYMLINK
+ TARGET
+ ${_TARGET_NAME}
+ PROPERTY
+ JNI_SYMLINK
+ )
+
+ if (__SYMLINK)
install(
FILES
- ${${_TARGET_NAME}_JNI_SYMLINK}
+ ${__SYMLINK}
DESTINATION
${_DESTINATION}
)
- else (${_TARGET_NAME}_JNI_SYMLINK)
+ else (__SYMLINK)
message(SEND_ERROR "The target ${_TARGET_NAME} is not known in this scope.")
- endif (${_TARGET_NAME}_JNI_SYMLINK)
+ endif (__SYMLINK)
endfunction(INSTALL_JNI_SYMLINK _TARGET_NAME _DESTINATION)
function (find_jar VARIABLE)