Accepting request 1072566 from home:rhabacker:branches:windows:mingw:win64:zlib

- In cmake macros, avoid changing the current directory
  to avoid build errors in packages that use multiple
  build systems such as mingw64-zlib

OBS-URL: https://build.opensuse.org/request/show/1072566
OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=155
This commit is contained in:
Fridrich Strba 2023-03-18 07:44:43 +00:00 committed by Git OBS Bridge
parent 222d8d5142
commit 2b0bf4d403
2 changed files with 12 additions and 6 deletions

View File

@ -7,9 +7,10 @@
%_mingw64_cmake %{_mingw64_env} ; \
mkdir -p %__builddir \
cd %__builddir \
%__cmake $OLDPWD/%__sourcedir \\\
%__cmake \\\
%__cmake_generator \\\
-S %__sourcedir \\\
-B %__builddir \\\
-DCMAKE_SYSTEM_NAME="Windows" \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \\\
@ -35,13 +36,11 @@
echo "Deprecated %%__mingw64_cmake macro used, please use %%_mingw64_cmake" \
%{_mingw64_cmake}
%_mingw64_cmake_build %cmake_build
%_mingw64_cmake_build %cmake_build -C %__builddir
%_mingw64_cmake_install %{_mingw64_env}; \
%cmake_install
%_mingw64_ctest(:-:) \
cd %__builddir \
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %** \
cd $OLDPWD
%__ctest --test-dir %__builddir --output-on-failure --force-new-ctest-process %{?_smp_mflags} %**

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 17 08:54:56 UTC 2023 - Ralf Habacker <ralf.habacker@freenet.de>
- In cmake macros, avoid changing the current directory
to avoid build errors in packages that use multiple
build systems such as mingw64-zlib
-------------------------------------------------------------------
Thu Feb 16 12:31:06 UTC 2023 - Ralf Habacker <ralf.habacker@freenet.de>