diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-21 12:32:01 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-30 13:34:48 -0500 |
| commit | 99c05ac83888005a1aa3a1c31fe77d8ee5e36c42 (patch) | |
| tree | f6a4dc3290b63c2444bc7e4a613305157f5a7808 /base | |
| parent | 60835ed008586f85a22737d0161cb026f2dbffec (diff) | |
| download | pki-99c05ac83888005a1aa3a1c31fe77d8ee5e36c42.tar.gz pki-99c05ac83888005a1aa3a1c31fe77d8ee5e36c42.tar.xz pki-99c05ac83888005a1aa3a1c31fe77d8ee5e36c42.zip | |
Updated CMake jar() function.
The jar() function has been modified to support multiple input dirs
in a single command. This way it's not necessary to define multiple
jar targets for the same jar file. The pki-console build script has
been updated to utilize this functionality.
Ticket #89
Diffstat (limited to 'base')
| -rw-r--r-- | base/console/src/CMakeLists.txt | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/base/console/src/CMakeLists.txt b/base/console/src/CMakeLists.txt index dcd1db8f6..ee7c25b58 100644 --- a/base/console/src/CMakeLists.txt +++ b/base/console/src/CMakeLists.txt @@ -107,7 +107,7 @@ javac(pki-console-classes pki-common-classes ) -# package common and console classes +# package common and console classes and resources jar(pki-console-jar CREATE ${CMAKE_BINARY_DIR}/dist/pki-console-${APPLICATION_VERSION}.jar @@ -116,18 +116,12 @@ jar(pki-console-jar FILES com/netscape/admin/certsrv/*.class com/netscape/certsrv/common/*.class - DEPENDS - pki-console-classes pki-common-classes -) - -# package console resources -jar(pki-console-resources - UPDATE - ${CMAKE_BINARY_DIR}/dist/pki-console-${APPLICATION_VERSION}.jar + INPUT_DIR + ${CMAKE_CURRENT_SOURCE_DIR} FILES com/netscape/admin/certsrv/images/*.gif DEPENDS - pki-console-jar + pki-console-classes pki-common-classes ) link(pki-console @@ -136,7 +130,7 @@ link(pki-console DEST pki-console-${APPLICATION_VERSION}.jar DEPENDS - pki-console-resources + pki-console-jar ) install( |