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.

Sign up for GitHub

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

Jump to bottom

cern-root: migrate to Conan v2 #18900

Closed
wants to merge 8 commits into from
Closed

cern-root: migrate to Conan v2 #18900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a87745e
cern-root: migrate to Conan v2
valgur Jul 20, 2023
80361f5
cern-root: bump deps
valgur Aug 7, 2023
386b88e
cern-root: CMake improvements
valgur Nov 21, 2023
e589049
cern-root: fix build, add more deps
valgur Nov 28, 2023
9079168
cern-root: fix libXft not being found
valgur Nov 28, 2023
c39e82d
Merge branch 'master' into migrate/cern-root
valgur Nov 29, 2023
0b21198
cern-root: relax TBB version check
valgur Nov 29, 2023
9998b16
cern-root: fix invalid define flags in cling build
valgur Jan 4, 2024
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
84 changes: 84 additions & 0 deletions recipes/cern-root/all/conan_deps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
macro(custom_find_package name)
find_package(${name} ${ARGN}
# Allow only Conan packages
NO_DEFAULT_PATH
PATHS ${CMAKE_PREFIX_PATH}
)
string(TOUPPER ${name} name_upper)
set(${name_upper}_FOUND TRUE)
set(${name_upper}_VERSION_STRING ${${name}_VERSION_STRING})
set(${name_upper}_INCLUDE_DIRS ${${name}_INCLUDE_DIRS})
set(${name_upper}_INCLUDE_DIR ${${name}_INCLUDE_DIR})
set(${name_upper}_LIBRARIES ${${name}_LIBRARIES})
set(${name_upper}_DEFINITIONS ${${name}_DEFINITIONS})
unset(name_upper)
endmacro()

# All packages listed under https://github.com/root-project/root/blob/v6-22-06/cmake/modules/SearchInstalledSoftware.cmake
#custom_find_package(AfterImage REQUIRED CONFIG)
#custom_find_package(Alien REQUIRED CONFIG)
custom_find_package(Arrow REQUIRED CONFIG)
#custom_find_package(BLAS REQUIRED CONFIG)
custom_find_package(CFITSIO REQUIRED CONFIG)
#custom_find_package(CUDA REQUIRED CONFIG)
#custom_find_package(CuDNN REQUIRED CONFIG)
custom_find_package(CURL REQUIRED CONFIG)
#custom_find_package(Davix REQUIRED CONFIG)
#custom_find_package(DCAP REQUIRED CONFIG)
#custom_find_package(FastCGI REQUIRED CONFIG)
custom_find_package(FFTW REQUIRED CONFIG)
custom_find_package(Freetype REQUIRED CONFIG)
#custom_find_package(FTGL REQUIRED CONFIG)
#custom_find_package(GFAL REQUIRED CONFIG)
#custom_find_package(gl2ps REQUIRED CONFIG)
custom_find_package(GLEW REQUIRED)
#custom_find_package(Graphviz REQUIRED CONFIG)
custom_find_package(GSL REQUIRED CONFIG)
#custom_find_package(jemalloc REQUIRED CONFIG)
custom_find_package(LibLZMA REQUIRED CONFIG)
find_package(libuuid QUIET)
custom_find_package(LibXml2 REQUIRED CONFIG)
custom_find_package(LZ4 REQUIRED CONFIG)
#custom_find_package(Monalisa REQUIRED CONFIG)
#custom_find_package(MPI REQUIRED CONFIG)
custom_find_package(MySQL REQUIRED CONFIG)
custom_find_package(ODBC REQUIRED CONFIG)
find_package(OpenGL REQUIRED)
custom_find_package(OpenSSL REQUIRED CONFIG)
#custom_find_package(Oracle REQUIRED CONFIG)
custom_find_package(PCRE REQUIRED CONFIG)
custom_find_package(PostgreSQL REQUIRED CONFIG)
#custom_find_package(Pythia6 REQUIRED CONFIG)
#custom_find_package(Pythia8 REQUIRED CONFIG)
#custom_find_package(R REQUIRED CONFIG)
custom_find_package(Sqlite REQUIRED CONFIG)
custom_find_package(TBB REQUIRED CONFIG)
#custom_find_package(tcmalloc REQUIRED CONFIG)
#custom_find_package(Unuran REQUIRED CONFIG)
#custom_find_package(Vc REQUIRED CONFIG)
#custom_find_package(Vdt REQUIRED CONFIG)
#custom_find_package(VecCore REQUIRED CONFIG)
#custom_find_package(VecGeom REQUIRED CONFIG)
#custom_find_package(XROOTD REQUIRED CONFIG)
custom_find_package(xxHash REQUIRED CONFIG)
custom_find_package(ZLIB REQUIRED CONFIG)
custom_find_package(ZSTD REQUIRED CONFIG)

if(asimage)
custom_find_package(GIF REQUIRED CONFIG)
custom_find_package(JPEG REQUIRED CONFIG)
custom_find_package(PNG REQUIRED CONFIG)
custom_find_package(TIFF REQUIRED CONFIG)
endif()

if(x11)
find_package(X11 REQUIRED)
custom_find_package(X11_Xft REQUIRED CONFIG)
set(X11_Xft_LIB ${X11_Xft_LIBRARIES})
set(X11_Xft_INCLUDE_PATH ${X11_Xft_INCLUDE_DIR}/X11/Xft/Xft.h)
custom_find_package(X11_Xpm REQUIRED CONFIG)
set(X11_Xpm_LIB ${X11_Xpm_LIBRARIES})
set(X11_Xpm_INCLUDE_PATH ${X11_Xpm_INCLUDE_DIR}/X11/xpm.h)
endif()

link_libraries(FreeType::FreeType)
6 changes: 4 additions & 2 deletions recipes/cern-root/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
url: "https://github.com/root-project/root/archive/v6-22-06.zip"
sha256: "125e056f315fb280b13e154d4b73d3b302ac1f5775062e89681edb86c1447a62"
patches:
"v6-22-06":
- patch_file: "patches/0001-add-missing-includes.patch"

Check warning on line 7 in recipes/cern-root/all/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/0001-add ... 
    ^ (line: 7)
base_path: "source_subfolder"
- patch_file: "patches/0002-cmake-missing-link-libraries.patch"

Check warning on line 8 in recipes/cern-root/all/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/0002-cma ... 
    ^ (line: 8)
base_path: "source_subfolder"
- patch_file: "patches/0003-backport-empty-define-filtering.patch"
patch_description: "Backport filtering of empty -D flags"
patch_type: "portability"
patch_source: "https://github.com/root-project/root/blob/798b9b079f7b6c136bdaaf6787729a1bef865429/cmake/modules/RootMacros.cmake"
Loading