blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

CMake: conform to cmake capitalization conventions

Browse Source
This commit is contained in:
nick black 2020-08-29 18:38:28 -04:00
parent 720f61d51f
commit e1863317a3
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -614,21 +614,21 @@ install(FILES
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
configure_file(tools/version.h.in include/version.h) configure_file(tools/version.h.in include/version.h)
configure_package_config_file(tools/notcursesConfig.cmake.in configure_package_config_file(tools/NotcursesConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/notcursesConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/NotcursesConfig.cmake
INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/notcurses/cmake INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/notcurses/cmake
) )
write_basic_package_version_file( write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/notcursesConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/NotcursesConfigVersion.cmake
COMPATIBILITY SameMajorVersion COMPATIBILITY SameMajorVersion
) )
# Installation # Installation
install(FILES install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/notcursesConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/NotcursesConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/notcursesConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/NotcursesConfigVersion.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/notcurses" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Notcurses"
) )
install(FILES install(FILES

2
NEWS.md
View File

@ -7,6 +7,8 @@ rearrangements of Notcurses.
* `ncreel` functions now generally call `ncreel_redraw()` themselves. This * `ncreel` functions now generally call `ncreel_redraw()` themselves. This
includes `ncreel_add()`, `ncreel_del()`, `ncreel_next()`, and includes `ncreel_add()`, `ncreel_del()`, `ncreel_next()`, and
`ncreel_prev()`. `ncreel_redraw()` need only be called to update tablets. `ncreel_prev()`. `ncreel_redraw()` need only be called to update tablets.
* In order to conform with CMake naming conventions, our CMake package is
now accessed as "Notcurses" rather than "notcurses".
* 1.6.19 (2020-08-27) * 1.6.19 (2020-08-27)
* Direct mode now places the terminal into "cbreak mode". This disables * Direct mode now places the terminal into "cbreak mode". This disables

2
USAGE.md
View File

@ -23,7 +23,7 @@ unified commentary, consider the [paperback](https://www.amazon.com/dp/B086PNVNC
A program wishing to use Notcurses will need to link it, ideally using the A program wishing to use Notcurses will need to link it, ideally using the
output of `pkg-config --libs notcurses`. It is advised to compile with the output of `pkg-config --libs notcurses`. It is advised to compile with the
output of `pkg-config --cflags notcurses`. If using CMake, a support file is output of `pkg-config --cflags notcurses`. If using CMake, a support file is
provided, and can be accessed as `notcurses`. provided, and can be accessed as `Notcurses`.
Before calling into Notcurses—and usually as one of the first calls of the Before calling into Notcurses—and usually as one of the first calls of the
program—be sure to call `setlocale(3)` with an appropriate UTF-8 locale. It is program—be sure to call `setlocale(3)` with an appropriate UTF-8 locale. It is

9
tools/NotcursesConfig.cmake.in Normal file
View File

@ -0,0 +1,9 @@
@PACKAGE_INIT@
set(Notcurses_DIR "@PACKAGE_SOME_INSTALL_DIR@")
# Compute paths
get_filename_component(Notcurses_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(Notcurses_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
set(Notcurses_LIBRARY_DIRS "@CONF_LIBRARY_DIRS@")
set(Notcurses_LIBRARIES -lnotcurses)

9
tools/notcursesConfig.cmake.in
View File

@ -1,9 +0,0 @@
@PACKAGE_INIT@
set(NOTCURSES_DIR "@PACKAGE_SOME_INSTALL_DIR@")
# Compute paths
get_filename_component(NOTCURSES_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(NOTCURSES_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
set(NOTCURSES_LIBRARY_DIRS "@CONF_LIBRARY_DIRS@")
set(Notcurses_LIBRARIES -lnotcurses)