Commit 756ff62b authored by Dave Moxey's avatar Dave Moxey
Browse files

Fixes for RPM

parent b3e4851c
......@@ -11,7 +11,9 @@ elseif(CPACK_GENERATOR STREQUAL "RPM")
set(ARCHITECTURE ${CPACK_RPM_PACKAGE_ARCHITECTURE})
set(CPACK_PACKAGE_FILE_NAME
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-1.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
"nektar-${CPACK_PACKAGE_VERSION}-1.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /usr /usr/bin /usr/lib64 /usr/lib64/openmpi
/usr/lib64/openmpi/lib /usr/lib64/openmpi/bin)
elseif(CPACK_GENERATOR STREQUAL "PackageMaker")
# OS X .pkg installer -- set install location
set(CPACK_MONOLITHIC_INSTALL ON)
......
......@@ -5,7 +5,7 @@
##
# Attempt to determine architecture for debian/RPM packages
execute_process(COMMAND dpkg --print-architecture
execute_process(COMMAND dpkg --print-architecture
OUTPUT_VARIABLE DPKG_ARCHITECTURE
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND rpm --eval %{_arch}
......@@ -77,6 +77,8 @@ MACRO(FINALISE_CPACK_COMPONENT name)
CACHE INTERNAL "")
SET(CPACK_COMPONENT_${COMPVAR}_DESCRIPTION_SUMMARY ${COMP_SUMMARY}
CACHE INTERNAL "")
SET(CPACK_RPM_${COMPVAR}_PACKAGE_SUMMARY ${COMP_SUMMARY}
CACHE INTERNAL "")
# Remove any duplicates from the existing CPack component dependencies
# which are set by NEKTAR_ADD_EXECUTABLE and NEKTAR_ADD_LIBRARY
......@@ -94,6 +96,9 @@ MACRO(FINALISE_CPACK_COMPONENT name)
SET(CPACK_DEBIAN_${COMPVAR}_FILE_NAME
"nektar++-${name}-${NEKTAR_VERSION}-${DPKG_ARCHITECTURE}.deb"
CACHE INTERNAL "")
SET(CPACK_RPM_${COMPVAR}_FILE_NAME
"nektar++-${name}-${NEKTAR_VERSION}-1.${RPM_ARCHITECTURE}.rpm"
CACHE INTERNAL "")
ENDIF()
ENDMACRO()
......@@ -338,6 +343,13 @@ MACRO(ADD_NEKTAR_LIBRARY name)
SET(CPACK_DEBIAN_${NEKLIB_COMPVAR}_PACKAGE_NAME
"libnektar++-${NEKLIB_COMPONENT}" CACHE INTERNAL "")
# RPM specific information
SET(CPACK_RPM_${NEKLIB_COMPVAR}_FILE_NAME
"libnektar++-${NEKLIB_COMPONENT}-1.${RPM_ARCHITECTURE}.rpm"
CACHE INTERNAL "")
SET(CPACK_RPM_${NEKLIB_COMPVAR}_PACKAGE_NAME
"libnektar++-${NEKLIB_COMPONENT}" CACHE INTERNAL "")
# If we have dependencies then link against them, and also configure CPack
# Debian dependencies, which are a special case for some reason. Then set up
# standard CPack components.
......
......@@ -122,3 +122,8 @@ INSTALL(DIRECTORY ./
DESTINATION ${NEKTAR_INCLUDE_DIR}/NekMeshUtils
COMPONENT dev
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
SET(CPACK_COMPONENT_DEV_DEPENDS ${NEKTAR_LIBS} CACHE INTERNAL "")
FINALISE_CPACK_COMPONENT(dev
SUMMARY "Nektar++ development headers"
DESCRIPTION "Headers for Nektar++ spectral element framework")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment