Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ncurses: migrate to Conan v2 #20355

Merged
merged 33 commits into from
Dec 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f025797
ncurses: migrate to Conan v2
valgur Oct 4, 2023
dab0101
ncurses: fix Conan v1 compatibility
valgur Oct 16, 2023
1f0acd6
ncurses: fix linter error
valgur Oct 16, 2023
4c09630
ncurses: add "util" from libc as a system dependency
valgur Oct 17, 2023
5fdc5dd
ncurses: update MSVC version check
valgur Oct 17, 2023
2a28dd3
ncurses: add libcxx to system_libs
valgur Oct 17, 2023
a91030a
ncurses: add automake dependency
valgur Oct 31, 2023
b0c8167
ncurses: remove -nologo
valgur Nov 1, 2023
78b9c61
ncurses: revert to not using ar-lib
valgur Nov 2, 2023
7045a76
ncurses: remove -nologo
valgur Nov 2, 2023
45a9abd
ncurses: disable MSVC 193, fix -FS
valgur Nov 2, 2023
b083c79
ncurses: link against naive-tsearch on MSVC
valgur Nov 2, 2023
9faf705
ncurses: add AutotoolsDeps for MSVC dependencies
valgur Nov 2, 2023
99b03b7
ncurses: add AutotoolsDeps workaround
valgur Nov 2, 2023
6af2d9d
ncurses: add -nologo
valgur Nov 2, 2023
986bf9b
ncurses: do not override the include dir path
valgur Nov 2, 2023
06cc271
ncurses: drop test_v1_package
valgur Nov 3, 2023
f430a16
ncurses: more reliable -FS
valgur Nov 3, 2023
e3073b4
ncurses: add /DEBUG:NONE
valgur Nov 4, 2023
94ca820
ncurses: force -DEBUG:NONE
valgur Nov 5, 2023
7a83ce0
ncurses: make sure CURSES_LIBRARIES contains absolute paths to match …
valgur Nov 5, 2023
6281903
ncurses: fix_apple_shared_install_name()
valgur Nov 6, 2023
275b275
ncurses: tidy
valgur Nov 6, 2023
bfa96e3
ncurses: Revert "drop test_v1_package"
valgur Nov 6, 2023
a38f589
ncurses: fix test_v1_package
valgur Nov 6, 2023
85ac288
ncurses: fix exported CMake vars in Conan v1
valgur Nov 7, 2023
4a1c315
Merge branch 'master' into migrate/ncurses
valgur Nov 8, 2023
e02a422
ncurses: drop test_v1_package
valgur Nov 10, 2023
33c1363
Merge branch 'master' into migrate/ncurses
valgur Nov 10, 2023
9918883
ncurses: set env var in generator
valgur Nov 16, 2023
d76664a
ncurses: fix options handling
valgur Nov 16, 2023
7c4d860
ncurses: restore "auto" option values for clarity and backwards-compa…
valgur Nov 17, 2023
17cf0eb
ncurses: fix -FS not being applied on Conan v1
valgur Nov 22, 2023
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
36 changes: 36 additions & 0 deletions recipes/ncurses/all/cmake/conan-official-ncurses-targets.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Reproduces the variables set by https://cmake.org/cmake/help/latest/module/FindCurses.html
set(CURSES_FOUND ON)
set(CURSES_INCLUDE_DIRS ${Curses_INCLUDE_DIRS})
set(CURSES_CFLAGS ${Curses_DEFINITIONS} ${Curses_COMPILE_OPTIONS_C})
set(CURSES_HAVE_CURSES_H OFF)
set(CURSES_HAVE_NCURSES_H OFF)
if(CURSES_NEED_NCURSES)
set(CURSES_HAVE_NCURSES_CURSES_H ON)
set(CURSES_HAVE_NCURSES_NCURSES_H ON)
endif()

# For backward compatibility with Conan v1
string(TOUPPER "${CMAKE_BUILD_TYPE}" _CONFIG)
set(CURSES_INCLUDE_DIRS ${CURSES_INCLUDE_DIRS}
${ncurses_INCLUDE_DIRS_${_CONFIG}}
${Curses_INCLUDE_DIRS_${_CONFIG}}
)
set(CURSES_CFLAGS ${CURSES_CFLAGS}
${ncurses_DEFINITIONS_${_CONFIG}} ${ncurses_COMPILE_OPTIONS_C_${_CONFIG}}
${Curses_DEFINITIONS_${_CONFIG}} ${Curses_COMPILE_OPTIONS_C_${_CONFIG}}
)

# CURSES_LIBRARIES output from CMake uses absolute paths for the libraries
list (GET CURSES_INCLUDE_DIRS 0 _first_include_dir)
get_filename_component(CURSES_LIB_DIRS "${_first_include_dir}/../lib" ABSOLUTE)
foreach(_LIB ${Curses_LIBRARIES} ${ncurses_LIBRARIES_${_CONFIG}} ${Curses_LIBRARIES_${_CONFIG}})
if(TARGET ${_LIB} OR IS_ABSOLUTE ${_LIB})
list(APPEND CURSES_LIBRARIES ${_LIB})
else()
find_library(_LIB ${_LIB} PATHS ${CURSES_LIB_DIRS})
list(APPEND CURSES_LIBRARIES ${_LIB})
endif()
endforeach()

set(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_DIRS})
set(CURSES_LIBRARY ${CURSES_LIBRARIES})
Loading