From 06fab6dba17e95bf9e6b399c3267c41b70259153 Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Mon, 22 Jul 2019 15:02:18 -0700 Subject: [PATCH] Restore compilation of curses teapot on OpenSUSE Tumbleweed 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. --- .gitignore | 1 + CMakeLists.txt | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build diff --git a/CMakeLists.txt b/CMakeLists.txt index d4adaa6..cab23d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(Teapot) set(Teapot_VERSION_MAJOR 2) 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_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) 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 () find_package(Curses) @@ -104,7 +109,7 @@ if (ENABLE_HELP) set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/teapot/index.html") 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) 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_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_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_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")