Skip to content
This repository was archived by the owner on Nov 27, 2024. It is now read-only.

Fix cmake --install and pkg-config #71

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ else ()
endif ()

add_library(libtelnet libtelnet.c)
set_target_properties(libtelnet PROPERTIES PREFIX "")

target_include_directories(libtelnet
PUBLIC
Expand All @@ -40,6 +41,9 @@ install(TARGETS libtelnet
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libtelnet.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
install(FILES libtelnet.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
Expand All @@ -48,4 +52,4 @@ install(EXPORT libtelnet-export
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libtelnet
)

include(CPack)
include(CPack)
38 changes: 20 additions & 18 deletions doc/man/man3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/libtelnet.h.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_environ_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_compress_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_data_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_environ_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_error_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_iac_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_negotiate_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_subnegotiate_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_ttype_t.3
${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
)
if (DOXYGEN_FOUND)
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/libtelnet.h.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_environ_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_compress_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_data_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_environ_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_error_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_iac_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_negotiate_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_subnegotiate_t.3
${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_ttype_t.3
${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
)
endif (DOXYGEN_FOUND)
4 changes: 2 additions & 2 deletions libtelnet.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ Name: libtelnet
Description: @PROJECT_DESCRIPTION@
URL: @PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@
Libs: -L${libdir} -ltelnet
Cflags: -I${includedir}
Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -ltelnet
Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@