I needed to change the UseJava.cmake script to allow INSTALL components and to
have more flexible locations for JAR resource files.
In addition I needed to change the java_copy_file function to use the
execute_process command.
Attached is the diff for my changes, hoping the correct folks will review.
Allen
185,191c185,194
< add_custom_command(
< OUTPUT ${dest}
< COMMAND cmake -E copy_if_different
< ARGS ${src}
< ${dest}
< DEPENDS ${src}
< COMMENT ${comment})
---
> # add_custom_command(
> # OUTPUT ${dest}
> # COMMAND cmake -E copy_if_different
> # ARGS ${src}
> # ${dest}
> # DEPENDS ${src}
> # COMMENT ${comment})
> execute_process(
> COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dest}
> )
224a228,233
> if (CMAKE_JAVA_RESOURCE_PATH)
> set (_CMAKE_JAVA_RESOURCE_PATH "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${CMAKE_JAVA_RESOURCE_PATH}")
> else (CMAKE_JAVA_RESOURCE_PATH)
> set (CMAKE_JAVA_RESOURCE_PATH ".")
> set (_CMAKE_JAVA_RESOURCE_PATH "${CMAKE_JAVA_CLASS_OUTPUT_PATH}")
> endif (CMAKE_JAVA_RESOURCE_PATH)
232c241,243
< set(_JAVA_TARGET_OUTPUT_LINK "${_TARGET_NAME}.jar")
---
> if (NOT WIN32)
> set(_JAVA_TARGET_OUTPUT_LINK "${_TARGET_NAME}.jar")
> endif (NOT WIN32)
277c288
< ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_SOURCE_FILE}
---
> ${_CMAKE_JAVA_RESOURCE_PATH}/${_JAVA_SOURCE_FILE}
279c290,291
< list(APPEND _JAVA_RESOURCE_FILES ${_JAVA_SOURCE_FILE})
---
> list(APPEND _JAVA_RESOURCE_LIST ${_CMAKE_JAVA_RESOURCE_PATH}/${_JAVA_SOURCE_FILE})
> list(APPEND _JAVA_RESOURCE_FILES ${CMAKE_JAVA_RESOURCE_PATH}/${_JAVA_SOURCE_FILE})
331c343
< DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
---
> DEPENDS ${_JAVA_RESOURCE_LIST} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
347c359
< DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
---
> DEPENDS ${_JAVA_RESOURCE_LIST} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
402c414
< function(INSTALL_JAR _TARGET_NAME _DESTINATION)
---
> function(INSTALL_JAR _TARGET_NAME _DESTINATION _COMPONENT)
415a428,429
> COMPONENT
> ${_COMPONENT}
420c434
< endfunction(INSTALL_JAR _TARGET_NAME _DESTINATION)
---
> endfunction(INSTALL_JAR _TARGET_NAME _DESTINATION _COMPONENT)
422c436
< function(INSTALL_JNI_SYMLINK _TARGET_NAME _DESTINATION)
---
> function(INSTALL_JNI_SYMLINK _TARGET_NAME _DESTINATION _COMPONENT)
435a450,451
> COMPONENT
> ${_COMPONENT}
440c456
< endfunction(INSTALL_JNI_SYMLINK _TARGET_NAME _DESTINATION)
---
> endfunction(INSTALL_JNI_SYMLINK _TARGET_NAME _DESTINATION _COMPONENT)
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
