Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit b40b2ac
Author: David Seifert <soap@gentoo.org>
Date:   Sun Jun 16 21:28:25 2019 +0200

    Add missing EOL

commit c9e4356
Author: David Seifert <soap@gentoo.org>
Date:   Sun Jun 16 21:28:22 2019 +0200

    Install pkg-config file

commit eb03050
Author: David Seifert <soap@gentoo.org>
Date:   Sun Jun 16 21:28:19 2019 +0200

    Version library

commit ae3e7f7
Author: David Seifert <soap@gentoo.org>
Date:   Sun Jun 16 21:28:16 2019 +0200

    Fix man installation path to honour GNUInstallDirs
  • Loading branch information
thefallentree committed Mar 3, 2020
1 parent 01799fe commit b70c7e8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ else ()
endif ()

add_library(libtelnet libtelnet.c)
set_target_properties(libtelnet
PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION 2)

target_include_directories(libtelnet
PUBLIC
Expand Down Expand Up @@ -59,5 +63,8 @@ install(EXPORT libtelnet-export
FILE libtelnet.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libtelnet
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libtelnet.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)

include(CPack)
include(CPack)
2 changes: 1 addition & 1 deletion doc/man/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
add_subdirectory(man1)
add_subdirectory(man3)
add_subdirectory(man3)
4 changes: 2 additions & 2 deletions doc/man/man1/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
install(
FILES telnet-chatd.1 telnet-client.1 telnet-proxy.1
DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
)
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
)
4 changes: 2 additions & 2 deletions doc/man/man3/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ install(
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_zmp_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_mssp_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_telopt_t.3
DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man3
)
DESTINATION ${CMAKE_INSTALL_MANDIR}/man3
)
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ foreach (test_name environ01 environ02 environ03 exopl01 exopl02 mssp01 rfc1143
add_test(
NAME ${test_name}
COMMAND telnet-test ${CMAKE_CURRENT_SOURCE_DIR}/${test_name}.input ${CMAKE_CURRENT_SOURCE_DIR}/${test_name}.txt)
endforeach ()
endforeach ()

0 comments on commit b70c7e8

Please sign in to comment.