diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-11-16 12:16:53 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-11-16 12:16:53 +0000 |
| commit | 344abe762077378e879dec21fa831e2925b8ef29 (patch) | |
| tree | 1c9d9d6c02bb20ffa20978e40d4a83f0ff5873b8 | |
| parent | 76029bd3a3fb084bfd62ceb241d9c5a32578dea6 (diff) | |
automatic import of cmake
| -rw-r--r-- | cmake.spec | 8 | ||||
| -rw-r--r-- | macros.cmake.in | 12 |
2 files changed, 17 insertions, 3 deletions
@@ -28,7 +28,7 @@ Name: cmake Version: 3.27.9 %global major_version %(echo %{version} | awk -F. '{print $1}') -Release: 7 +Release: 8 Summary: Cross-platform make system License: BSD-3-Clause AND MIT-open-group AND Zlib URL: http://www.cmake.org @@ -316,9 +316,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog -* Wed Oct 30 2024 Funda Wang <fundawang@yeah.net> - 3.27.9-7 +* Wed Nov 06 2024 Funda Wang <fundawang@yeah.net> - 3.27.9-8 - default to out-of-source build +* Tue Nov 05 2024 Funda Wang <fundawang@yeah.net> - 3.27.9-7 +- change __cmake_builddir definition based on numeric comparision +- force define source and binary directory + * Mon Sep 02 2024 Funda Wang <fundawang@yeah.net> - 3.27.9-6 - make use of _vpath_builddir, but default to in source build for backward compatibility - enable check section diff --git a/macros.cmake.in b/macros.cmake.in index accad53..9e5dec1 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -9,7 +9,17 @@ %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest -%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.} +%__cmake_builddir %{lua: + if rpm.expand('%{__cmake_in_source_build}') == '%{__cmake_in_source_build}' then + print(rpm.expand('%{_vpath_builddir}')) + else + if rpm.expand('%{__cmake_in_source_build}') == '0' then + print(rpm.expand('%{_vpath_builddir}')) + else + print(".") + end + end +} %_cmake_module_linker_flags %(echo %build_ldflags|sed -e 's#-Wl,--no-undefined##') # - Set default compile flags |