diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e6cbb75..271b804 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY ${UCA_DESCRIPTION}) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +SET(UCA_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(src) add_subdirectory(test) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3c80afd..eab7a54 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -282,7 +282,9 @@ set(CPACK_PACKAGE_NAME "libuca") # --- Distro specific set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.6), libgcc1 (>= 1:4.1)") -set(CPACK_SET_DESTDIR ON) + +# this doesn't work when building RPMs on Jenkins +#set(CPACK_SET_DESTDIR ON) set(CPACK_PACKAGE_CONTACT "Matthias Vogelgesang") set(CPACK_PACKAGE_VENDOR "Karlsruhe Institute of Technology/IPE") @@ -297,4 +299,7 @@ set(CPACK_SOURCE_IGNORE_FILES ".git" "tags" ".bzr" ".swp") set(CPACK_SOURCE_PACKAGE_FILE_NAME "libuca-${UCA_VERSION_STRING}" CACHE INTERNAL "tarball basename") set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${UCA_VERSION_STRING}-${CMAKE_SYSTEM_PROCESSOR}") +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../libuca.spec.in" + "${CMAKE_CURRENT_BINARY_DIR}/../libuca.spec" @ONLY IMMEDIATE) + include(CPack) |