diff --git a/macros.hpc b/macros.hpc index 460e25f..8ca376e 100644 --- a/macros.hpc +++ b/macros.hpc @@ -634,3 +634,19 @@ sys.exit(0)" %{1} done; \ done +# wraps macro from macros.cmake - paths replaced by HPC paths. +%hpc_cmake \ + %{!?cmake:%{error: please include macros.cmake}} \ + %{?cmake: \ + %global __cmake %{_bindir}/cmake \ + %define _prefix %{hpc_prefix} \ + %define _includedir %{hpc_includedir} \ + %define _libdir %{hpc_libdir} \ + %define _datadir %{hpc_datadir} \ + %cmake \\\ + %undefine __cmake \\\ + %undefine _prefix \\\ + %undefine _includedir \\\ + %undefine _libdir \\\ + %undefine _datadir \\\ + } diff --git a/suse-hpc.changes b/suse-hpc.changes index fe7d96a..8d87b44 100644 --- a/suse-hpc.changes +++ b/suse-hpc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 26 10:49:00 UTC 2018 - eich@suse.com + +- Add %%hpc_cmake which wraps %%cmake from marcos.cmake. + ------------------------------------------------------------------- Thu Oct 25 10:51:17 UTC 2018 - eich@suse.com