mirror of
https://github.com/dankamongmen/notcurses
synced 2025-03-09 17:19:03 -04:00
bring up to speed with current master
This commit is contained in:
commit
83e6a0a43e
@ -585,11 +585,21 @@ target_compile_options(notcurses-static
|
||||
-fPIE
|
||||
)
|
||||
|
||||
file(GLOB NOTCURSES_HEADERS
|
||||
CONFIGURE_DEPENDS
|
||||
LIST_DIRECTORIES false
|
||||
${PROJECT_SOURCE_DIR}/include/notcurses/*.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/include/version.h)
|
||||
target_compile_options(notcurses++-static
|
||||
PRIVATE
|
||||
${NCPP_COMPILE_OPTIONS}
|
||||
-fPIE
|
||||
)
|
||||
|
||||
target_compile_definitions(notcurses++
|
||||
PUBLIC
|
||||
${NCPP_COMPILE_DEFINITIONS_PUBLIC}
|
||||
)
|
||||
|
||||
target_compile_definitions(notcurses++-static
|
||||
PUBLIC
|
||||
${NCPP_COMPILE_DEFINITIONS_PUBLIC}
|
||||
)
|
||||
|
||||
file(GLOB NCPP_HEADERS
|
||||
CONFIGURE_DEPENDS
|
||||
@ -601,12 +611,18 @@ file(GLOB NCPP_INTERNAL_HEADERS
|
||||
LIST_DIRECTORIES false
|
||||
${PROJECT_SOURCE_DIR}/include/ncpp/internal/*.hh)
|
||||
|
||||
export(PACKAGE notcurses)
|
||||
|
||||
install(FILES ${NOTCURSES_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/notcurses)
|
||||
install(FILES ${NCPP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ncpp)
|
||||
install(FILES ${NCPP_INTERNAL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ncpp/internal)
|
||||
|
||||
export(PACKAGE notcurses)
|
||||
|
||||
file(GLOB NOTCURSES_HEADERS
|
||||
CONFIGURE_DEPENDS
|
||||
LIST_DIRECTORIES false
|
||||
${PROJECT_SOURCE_DIR}/include/notcurses/*.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/include/version.h)
|
||||
install(FILES ${NOTCURSES_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/notcurses)
|
||||
|
||||
# tiny proofs of concept, one binary per source file
|
||||
if(USE_POC)
|
||||
file(GLOB POCSRCS CONFIGURE_DEPENDS src/poc/*.c)
|
||||
@ -1024,11 +1040,12 @@ configure_file(tools/notcurses-ffi.pc.in
|
||||
@ONLY
|
||||
)
|
||||
endif()
|
||||
configure_file(tools/notcurses++.pc.in
|
||||
if(${USE_CXX})
|
||||
configure_file(tools/notcurses++.pc.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/notcurses++.pc
|
||||
@ONLY
|
||||
)
|
||||
|
||||
endif()
|
||||
include(CMakePackageConfigHelpers)
|
||||
configure_file(tools/version.h.in include/version.h)
|
||||
configure_file(tools/builddef.h.in include/builddef.h)
|
||||
@ -1053,6 +1070,7 @@ write_basic_package_version_file(
|
||||
COMPATIBILITY SameMajorVersion
|
||||
)
|
||||
|
||||
if(${USE_CXX})
|
||||
configure_package_config_file(tools/Notcurses++Config.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/Notcurses++Config.cmake
|
||||
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Notcurses++
|
||||
@ -1062,6 +1080,7 @@ write_basic_package_version_file(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/Notcurses++ConfigVersion.cmake
|
||||
COMPATIBILITY SameMajorVersion
|
||||
)
|
||||
endif()
|
||||
|
||||
# Installation
|
||||
install(FILES
|
||||
@ -1076,11 +1095,13 @@ install(FILES
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Notcurses"
|
||||
)
|
||||
|
||||
if(${USE_CXX})
|
||||
install(FILES
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/Notcurses++Config.cmake"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/Notcurses++ConfigVersion.cmake"
|
||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Notcurses++"
|
||||
)
|
||||
endif()
|
||||
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/notcurses-core.pc
|
||||
@ -1099,10 +1120,12 @@ install(FILES
|
||||
)
|
||||
endif()
|
||||
|
||||
if(${USE_CXX})
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/notcurses++.pc
|
||||
DESTINATION ${PKGCONFIG_DIR}
|
||||
)
|
||||
endif()
|
||||
|
||||
if(NOT ${USE_MULTIMEDIA} STREQUAL "none")
|
||||
file(GLOB TESTDATA CONFIGURE_DEPENDS data/*)
|
||||
|
Loading…
x
Reference in New Issue
Block a user