diff options
| author | asn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-10-19 17:45:31 +0000 |
|---|---|---|
| committer | asn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-10-19 17:45:31 +0000 |
| commit | 075db97230449534db8c524dea365222ecfaaca8 (patch) | |
| tree | cd996d6aa4a882a500e881177e42fa739a7ce481 /pki/cmake | |
| parent | eb7a02af920b324be6511b753ce6ecc27b61733c (diff) | |
| download | pki-075db97230449534db8c524dea365222ecfaaca8.tar.gz pki-075db97230449534db8c524dea365222ecfaaca8.tar.xz pki-075db97230449534db8c524dea365222ecfaaca8.zip | |
cmake: Added check for the UseJavaClassFilelist location.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1409 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/cmake')
| -rw-r--r-- | pki/cmake/Modules/UseJava.cmake | 9 | ||||
| -rw-r--r-- | pki/cmake/Modules/UseJavaClassFilelist.cmake (renamed from pki/cmake/Modules/JavaClassFilelist.cmake) | 0 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pki/cmake/Modules/UseJava.cmake b/pki/cmake/Modules/UseJava.cmake index e48e1c338..87cccfdca 100644 --- a/pki/cmake/Modules/UseJava.cmake +++ b/pki/cmake/Modules/UseJava.cmake @@ -108,6 +108,13 @@ function(ADD_JAR _TARGET_NAME) endif (_JAVA_EXT MATCHES ".java") endforeach(_JAVA_SOURCE_FILE) + # Check if we have a local UseJavaClassFilelist.cmake + if (EXISTS ${CMAKE_MODULE_PATH}/UseJavaClassFilelist.cmake) + set(_JAVA_CLASS_FILELIST ${CMAKE_MODULE_PATH}/UseJavaClassFilelist.cmake) + elseif (EXISTS ${CMAKE_ROOT}/Modules/UseJavaClassFilelist.cmake) + set(_JAVA_CLASS_FILELIST ${CMAKE_ROOT}/Modules/UseJavaClassFilelist.cmake) + endif (EXISTS ${CMAKE_MODULE_PATH}/UseJavaClassFilelist.cmake) + # create an empty java_class_filelist file(WRITE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist "") @@ -122,7 +129,7 @@ function(ADD_JAR _TARGET_NAME) ${_JAVA_COMPILE_FILES} COMMAND ${CMAKE_COMMAND} -DCMAKE_JAVA_CLASS_OUTPUT_PATH=${CMAKE_JAVA_CLASS_OUTPUT_PATH} - -P ${CMAKE_MODULE_PATH}/JavaClassFilelist.cmake + -P ${_JAVA_CLASS_FILELIST} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Building Java objects for ${_TARGET_NAME}.jar" ) diff --git a/pki/cmake/Modules/JavaClassFilelist.cmake b/pki/cmake/Modules/UseJavaClassFilelist.cmake index bee84a264..bee84a264 100644 --- a/pki/cmake/Modules/JavaClassFilelist.cmake +++ b/pki/cmake/Modules/UseJavaClassFilelist.cmake |