#1 Synchronize %cmake_lxqt macro with %cmake macro
Merged 3 years ago by zsun. Opened 3 years ago by ngompa.
rpms/ ngompa/liblxqt fix-cmake-macros  into  master

file modified
+5 -2
@@ -5,7 +5,7 @@ 

  

  Name:		liblxqt

  Version:	0.16.0

- Release:	1%{?dist}

+ Release:	2%{?dist}

  License:	LGPLv2

  Summary:	Core shared library for LXQt desktop suite

  Url:		http://lxqt.org/
@@ -57,7 +57,7 @@ 

  This package provides translations for the liblxqt package.

  

  %prep

- %setup -q 

+ %autosetup -p1

  

  %build

  %if 0%{?el7}
@@ -106,6 +106,9 @@ 

  %{_datadir}/lxqt/translations/%{name}/liblxqt_arn.qm

  

  %changelog

+ * Thu Dec 24 2020 Neal Gompa <ngompa13@gmail.com> - 0.16.0-2

+ - Synchronize cmake_lxqt macro with cmake macro

+ 

  * Mon Nov 23 2020 Zamir SUN <sztsian@gmail.com> - 0.16.0-1

  - Update to 0.16.0

  

file modified
+4
@@ -9,12 +9,16 @@ 

  # - Set default install prefixes and library install directories

  # - Turn on shared libraries by default

  %cmake_lxqt \

+   %undefine __cmake_in_source_build \

+   %undefine __cmake3_in_source_build \

    CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \

    CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \

    FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \

    FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \

    %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \

    %{?fedora:%{__cmake}}%{!?fedora:%{__cmake3}} \\\

+         %{?__cmake_builddir:-S "%{_vpath_srcdir}"} \\\

+         %{?__cmake_builddir:-B "%{__cmake_builddir}"} \\\

          -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\

          -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\

          -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\

This synchronizes the behavior of %cmake_lxqt with %cmake_kf5 and %cmake.

Reference: https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds

@zsun Can you please take a look at this?

Sorry, I missed the notification email. This looks good. Thanks!

Pull-Request has been merged by zsun

3 years ago