diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-02-23 03:18:50 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-02-23 17:12:35 +0100 |
| commit | f5293bac716a11721ab601ff027ce141230fd501 (patch) | |
| tree | aea71b12fb014652dd69a099ef6b7f25864c7f9f /base/tps | |
| parent | dd77a7d4e199d7678176398324957c2d45e28205 (diff) | |
| download | pki-f5293bac716a11721ab601ff027ce141230fd501.tar.gz pki-f5293bac716a11721ab601ff027ce141230fd501.tar.xz pki-f5293bac716a11721ab601ff027ce141230fd501.zip | |
Fixed build problem on RHEL.
The CMake create_symlink commands do not work on RHEL if the
source does not exist yet, so they have been replaced with regular
ln commands.
Diffstat (limited to 'base/tps')
| -rw-r--r-- | base/tps/CMakeLists.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/base/tps/CMakeLists.txt b/base/tps/CMakeLists.txt index 863a2a9db..652f0c914 100644 --- a/base/tps/CMakeLists.txt +++ b/base/tps/CMakeLists.txt @@ -20,14 +20,14 @@ add_custom_target(pki-tps-lib ALL) add_custom_command( TARGET pki-tps-lib - COMMAND ${CMAKE_COMMAND} -E make_directory lib - COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/pki/pki-nsutil.jar lib/pki-nsutil.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/pki/pki-cmsutil.jar lib/pki-cmsutil.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/pki/pki-certsrv.jar lib/pki-certsrv.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/pki/pki-cms.jar lib/pki-cms.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/pki/pki-cmscore.jar lib/pki-cmscore.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/pki/pki-cmsbundle.jar lib/pki-cmsbundle.jar - COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/pki/pki-tps.jar lib/pki-tps.jar + COMMAND ${CMAKE_COMMAND} -E make_directory webapp/lib + COMMAND /usr/bin/ln -sf /usr/share/java/pki/pki-nsutil.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-nsutil.jar + COMMAND /usr/bin/ln -sf /usr/share/java/pki/pki-cmsutil.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-cmsutil.jar + COMMAND /usr/bin/ln -sf /usr/share/java/pki/pki-certsrv.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-certsrv.jar + COMMAND /usr/bin/ln -sf /usr/share/java/pki/pki-cms.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-cms.jar + COMMAND /usr/bin/ln -sf /usr/share/java/pki/pki-cmscore.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-cmscore.jar + COMMAND /usr/bin/ln -sf /usr/share/java/pki/pki-cmsbundle.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-cmsbundle.jar + COMMAND /usr/bin/ln -sf /usr/share/java/pki/pki-tps.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-tps.jar ) # install manual pages @@ -54,7 +54,7 @@ install( install( DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR}/lib/ + ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/ DESTINATION ${DATA_INSTALL_DIR}/tps/webapps/tps/WEB-INF/lib ) |