glen/teapot-spreadsheet
1
1
Fork 0
Code Issues 48 Pull Requests Releases Wiki Activity

Restore compilation of curses teapot on OpenSUSE Tumbleweed

Browse Source 
The XDR library is no longer in the Gnu standard library, but it can be
  supplied in Tumbleweed via the tirpc library, so look for that as an
  option.
  Also renamed README to README.md in the packaging, to reflect prior change.
This commit is contained in:
Glen Whitney 2019-07-22 15:02:18 -07:00
parent 4451032ab9
commit 06fab6dba1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
build

13
CMakeLists.txt
View File

@ -3,7 +3,7 @@ project(Teapot)
set(Teapot_VERSION_MAJOR 2) set(Teapot_VERSION_MAJOR 2)
set(Teapot_VERSION_MINOR 3) set(Teapot_VERSION_MINOR 3)
set(Teapot_VERSION_PATCH 0) set(Teapot_VERSION_PATCH 0devel)
option(ENABLE_HELP "Enable built-in documentation" ON) option(ENABLE_HELP "Enable built-in documentation" ON)
option(ENABLE_UTF8 "Enable UTF-8 support" ON) option(ENABLE_UTF8 "Enable UTF-8 support" ON)
@ -13,7 +13,12 @@ add_library(teapotlib context.c csv.c eval.c func.c htmlio.c latex.c main.c misc
find_library(LIB_PORTABLEXDR portablexdr) find_library(LIB_PORTABLEXDR portablexdr)
if (NOT LIB_PORTABLEXDR) if (NOT LIB_PORTABLEXDR)
set(LIB_PORTABLEXDR "") find_library(LIB_TIRPC tirpc)
if (LIB_TIRPC)
set(LIB_PORTABLEXDR ${LIB_TIRPC})
else ()
set(LIB_PORTABLEXDR "")
endif ()
endif () endif ()
find_package(Curses) find_package(Curses)
@ -104,7 +109,7 @@ if (ENABLE_HELP)
set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/teapot/index.html") set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/teapot/index.html")
endif () endif ()
install(FILES COPYING README DESTINATION share/doc/teapot) install(FILES COPYING README.md DESTINATION share/doc/teapot)
install(FILES teapot.1 DESTINATION share/man/man1) install(FILES teapot.1 DESTINATION share/man/man1)
add_custom_target(dist add_custom_target(dist
@ -126,7 +131,7 @@ set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ARCH-NOTFOUND CACHE ".deb Architecture" ST
set(CPACK_RPM_PACKAGE_ARCHITECTURE ARCH-NOTFOUND CACHE ".rpm Architecture" STRING) set(CPACK_RPM_PACKAGE_ARCHITECTURE ARCH-NOTFOUND CACHE ".rpm Architecture" STRING)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Table Editor And Planner, Or: Teapot!") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Table Editor And Planner, Or: Teapot!")
set(CPACK_PACKAGE_DESCRIPTION "A three-dimensional spreadsheet specialized in advanced calculations. Comes in GUI (FLTK) and console (curses) flavours.") set(CPACK_PACKAGE_DESCRIPTION "A three-dimensional spreadsheet specialized in advanced calculations. Comes in GUI (FLTK) and console (curses) flavours.")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
set(CPACK_PACKAGE_VENDOR "Jörg Walter, http://www.syntax-k.de/projekte/teapot") set(CPACK_PACKAGE_VENDOR "Jörg Walter, http://www.syntax-k.de/projekte/teapot")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")