CMake: properly link in libunistring, fixing notcurses-tester link on bsd #1617

This commit is contained in:
nick black 2021-05-01 21:25:58 -03:00
parent 5b926d311c
commit 076792bdb8

View File

@ -26,7 +26,7 @@ cmake_dependent_option(
option(USE_DOXYGEN "Build HTML cross reference with doxygen" OFF) option(USE_DOXYGEN "Build HTML cross reference with doxygen" OFF)
option(USE_PANDOC "Build man pages and HTML reference with pandoc" ON) option(USE_PANDOC "Build man pages and HTML reference with pandoc" ON)
option(USE_POC "Build small, uninstalled proof-of-concept binaries" ON) option(USE_POC "Build small, uninstalled proof-of-concept binaries" ON)
option(USE_QRCODEGEN "Disable libqrcodegen QR code support" OFF) option(USE_QRCODEGEN "Enable libqrcodegen QR code support" OFF)
option(USE_STATIC "Build static libraries (in addition to shared)" ON) option(USE_STATIC "Build static libraries (in addition to shared)" ON)
set(USE_MULTIMEDIA "ffmpeg" CACHE STRING "Multimedia engine, one of 'ffmpeg', 'oiio', or 'none'") set(USE_MULTIMEDIA "ffmpeg" CACHE STRING "Multimedia engine, one of 'ffmpeg', 'oiio', or 'none'")
set_property(CACHE USE_MULTIMEDIA PROPERTY STRINGS ffmpeg oiio none) set_property(CACHE USE_MULTIMEDIA PROPERTY STRINGS ffmpeg oiio none)
@ -167,7 +167,7 @@ target_link_libraries(notcurses-core
"${READLINE_LIBRARIES}" "${READLINE_LIBRARIES}"
"${LIBM}" "${LIBM}"
"${LIBRT}" "${LIBRT}"
unistring "${unistring}"
PUBLIC PUBLIC
Threads::Threads Threads::Threads
) )
@ -177,7 +177,7 @@ target_link_libraries(notcurses-core-static
"${READLINE_STATIC_LIBRARIES}" "${READLINE_STATIC_LIBRARIES}"
"${LIBM}" "${LIBM}"
"${LIBRT}" "${LIBRT}"
unistring "${unistring}"
PUBLIC PUBLIC
Threads::Threads Threads::Threads
) )
@ -644,7 +644,7 @@ target_include_directories(notcurses-tester
target_link_libraries(notcurses-tester target_link_libraries(notcurses-tester
PRIVATE PRIVATE
notcurses++ notcurses++
unistring "${unistring}"
"${TERMINFO_LIBRARIES}" "${TERMINFO_LIBRARIES}"
) )
add_test( add_test(