diff --git a/CMake/cmt-ulib.spec.in b/CMake/cmt-ulib.spec.in index ca943e3..4e985aa 100644 --- a/CMake/cmt-ulib.spec.in +++ b/CMake/cmt-ulib.spec.in @@ -7,7 +7,11 @@ Vendor: INFN URL: https://github.com/OpenCMT/uLib Group: Development/Libraries BuildArch: %{_arch} +%if %{?rhel}%{!?rhel:0} >= 8 +BuildRequires: cmake +%else BuildRequires: cmake3 +%endif BuildRequires: boost-devel BuildRequires: eigen3-devel BuildRequires: vtk-devel @@ -33,11 +37,12 @@ mkdir -p %{buildroot} %build mkdir %{_builddir}/%{name}-%{version}/build cd %{_builddir}/%{name}-%{version}/build -cmake3 -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ +%cmake -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPACKAGE_INSTALL_LIB_DIR=%{buildroot}/usr/lib64 \ -DNODOXYGEN=ON \ %{_builddir}/%{name}-%{version} -make +make %{?_smp_mflags} %install cd %{_builddir}/%{name}-%{version}/build @@ -55,9 +60,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root) /usr/lib64/libmutom*.so.0.2 - - - +/usr/lib64/uLibRootDict_rdict.pcm %package devel Summary: Cosmic Muon Tomography core libraries, development files diff --git a/CMakeLists.txt b/CMakeLists.txt index a06893f..27accf4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,7 @@ set(ULIB_SELECTED_MODULES Core Math Detectors + Root ) ## uLib_add_shared_library puts names there diff --git a/src/Root/CMakeLists.txt b/src/Root/CMakeLists.txt index 6e23753..e39d9ac 100644 --- a/src/Root/CMakeLists.txt +++ b/src/Root/CMakeLists.txt @@ -44,6 +44,9 @@ set_source_files_properties(uLibRootDict.cxx PROPERTIES GENERATED TRUE) set_source_files_properties(uLibRootDict.h PROPERTIES GENERATED TRUE) list(APPEND SOURCES uLibRootDict.cxx) +# TODO use a custom target linked to root_generate_dictionary +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uLibRootDict_rdict.pcm + DESTINATION ${PACKAGE_INSTALL_LIB_DIR}) uLib_add_shared_library(${uLib-module}) add_subdirectory(testing)