diff options
| author | asn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-17 21:15:06 +0000 |
|---|---|---|
| committer | asn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-17 21:15:06 +0000 |
| commit | 760e90a9d139cbc9f8905d93e096fbda3e73e65c (patch) | |
| tree | d2e165d6ef61a04f3064f7c89642f3e5ab533c14 /pki/cmake | |
| parent | d0e2c8417526de42f4375d27fb10c13b978783b6 (diff) | |
| download | pki-760e90a9d139cbc9f8905d93e096fbda3e73e65c.tar.gz pki-760e90a9d139cbc9f8905d93e096fbda3e73e65c.tar.xz pki-760e90a9d139cbc9f8905d93e096fbda3e73e65c.zip | |
cmake: Check that we have empty variables or reset them.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1649 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/cmake')
| -rw-r--r-- | pki/cmake/Modules/UseJava.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pki/cmake/Modules/UseJava.cmake b/pki/cmake/Modules/UseJava.cmake index cdac8176..2d715df0 100644 --- a/pki/cmake/Modules/UseJava.cmake +++ b/pki/cmake/Modules/UseJava.cmake @@ -103,7 +103,7 @@ function (__java_copy_file src dest comment) COMMENT ${comment}) endfunction (__java_copy_file src dest comment) -function(ADD_JAR _TARGET_NAME) +function(add_jar _TARGET_NAME) set(_JAVA_SOURCE_FILES ${ARGN}) if (LIBRARY_OUTPUT_PATH) @@ -141,9 +141,12 @@ function(ADD_JAR _TARGET_NAME) elseif (CMAKE_JAVA_TARGET_OUTPUT_NAME) set(_JAVA_TARGET_OUTPUT_NAME "${CMAKE_JAVA_TARGET_OUTPUT_NAME}.jar") endif (CMAKE_JAVA_TARGET_OUTPUT_NAME AND CMAKE_JAVA_TARGET_VERSION) + # reset + set(CMAKE_JAVA_TARGET_OUTPUT_NAME) set(_JAVA_CLASS_FILES) set(_JAVA_COMPILE_FILES) + set(_JAVA_DEPENDS) set(_JAVA_RESOURCE_FILES) foreach(_JAVA_SOURCE_FILE ${_JAVA_SOURCE_FILES}) get_filename_component(_JAVA_EXT ${_JAVA_SOURCE_FILE} EXT) @@ -256,7 +259,7 @@ function(ADD_JAR _TARGET_NAME) set(${_TARGET_NAME}_CLASS_DIR ${CMAKE_JAVA_CLASS_OUTPUT_PATH} PARENT_SCOPE) -endfunction(ADD_JAR) +endfunction(add_jar) function(INSTALL_JAR _TARGET_NAME _DESTINATION) if (${_TARGET_NAME}_INSTALL_FILES) |