more cmake_path love (#929227)
This commit is contained in:
parent
1a2d03d685
commit
59f9c573f5
|
@ -8,7 +8,7 @@
|
||||||
Summary: Qt5 - QtBase components
|
Summary: Qt5 - QtBase components
|
||||||
Name: qt5-qtbase
|
Name: qt5-qtbase
|
||||||
Version: 5.0.2
|
Version: 5.0.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
|
@ -24,6 +24,7 @@ Patch2: qtbase-multilib_optflags.patch
|
||||||
##upstream patches
|
##upstream patches
|
||||||
# https://bugzilla.redhat.com/929227
|
# https://bugzilla.redhat.com/929227
|
||||||
# https://codereview.qt-project.org/52778
|
# https://codereview.qt-project.org/52778
|
||||||
|
# https://codereview.qt-project.org/53449
|
||||||
Patch100: qtbase-opensource-src-5.0.2-cmake_path.patch
|
Patch100: qtbase-opensource-src-5.0.2-cmake_path.patch
|
||||||
Patch1341: 0341-Rename-qAbs-Function-for-timeval.patch
|
Patch1341: 0341-Rename-qAbs-Function-for-timeval.patch
|
||||||
|
|
||||||
|
@ -327,6 +328,21 @@ done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
|
## work-in-progress, doesn't work yet -- rex
|
||||||
|
%if 0
|
||||||
|
%check
|
||||||
|
export CMAKE_PREFIX_PATH=%{buildroot}%{_prefix}
|
||||||
|
export CTEST_OUTPUT_ON_FAILURE=1
|
||||||
|
export PATH=%{buildroot}%{_bindir}:$PATH
|
||||||
|
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
|
||||||
|
mkdir tests/auto/cmake/%{_target_platform}
|
||||||
|
pushd tests/auto/cmake/%{_target_platform}
|
||||||
|
cmake ..
|
||||||
|
ctest --output-on-failure
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
@ -462,6 +478,9 @@ popd
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-2
|
||||||
|
- more cmake_path love (#929227)
|
||||||
|
|
||||||
* Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.0.2-1
|
* Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.0.2-1
|
||||||
- 5.0.2
|
- 5.0.2
|
||||||
- fix cmake config (#929227)
|
- fix cmake config (#929227)
|
||||||
|
|
|
@ -10,3 +10,16 @@ diff -up qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
diff -up qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.cmake_path qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||||
|
diff -up qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake.cmake_path qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake
|
||||||
|
--- qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake.cmake_path 2013-04-08 19:11:13.000000000 -0500
|
||||||
|
+++ qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake 2013-04-10 12:47:56.296486039 -0500
|
||||||
|
@@ -234,7 +234,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9
|
||||||
|
|
||||||
|
foreach(_module ${_qt5_modules})
|
||||||
|
if (NOT Qt5${_module}_FOUND)
|
||||||
|
- find_package(Qt5${_module} PATHS ${_qt5Core_install_prefix} NO_DEFAULT_PATH)
|
||||||
|
+ find_package(Qt5${_module} PATHS "${CMAKE_CURRENT_LIST_DIR}/.." NO_DEFAULT_PATH)
|
||||||
|
if (NOT Qt5${_module}_FOUND)
|
||||||
|
message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
|
||||||
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue