[kdelibs/KDE/4.14] cmake/modules: Remove policy settings from FindKDE4Internal.

Albert Astals Cid aacid at kde.org
Mon Jul 20 21:31:39 BST 2015


El Dilluns, 20 de juliol de 2015, a les 20:27:24, Albert Astals Cid va 
escriure:
> By the looks of it, it seems it's also making this not compile anymore
> 
> https://build.kde.org/job/kdenetwork-filesharing%20Applications-15.08%20stab
> le-qt4/PLATFORM=Linux,compiler=gcc/1/console

Actually this one seems to have autofixed itself.

Weird.

Albert

> 
> Sad Albert is Sad
> 
> El Dilluns, 20 de juliol de 2015, a les 20:20:06, Albert Astals Cid va 
escriure:
> > Do we really need all these commits in a frozen kdelibs?
> > 
> > Are they bugfixes?
> > 
> > Has someone reviewed them?
> > 
> > It seems at least one of them has caused kde-workspace to stop compiling.
> > 
> > Can you clarify what's the benefit of these set of commits?
> > 
> > Cheers,
> > 
> >   Albert
> > 
> > El Dilluns, 20 de juliol de 2015, a les 18:07:14, Stephen Kelly va 
escriure:
> > > Git commit ddd2b3290d5d7cef9abfba7ce5e15b6c801d531c by Stephen Kelly.
> > > Committed on 20/07/2015 at 18:04.
> > > Pushed by skelly into branch 'KDE/4.14'.
> > > 
> > > Remove policy settings from FindKDE4Internal.
> > > 
> > > At this point, the ones which are set here are all set to NEW, except
> > > CMP0011.  The point of CMP0011 here is to make the policy settings
> > > be used by consumers.  All consumers need to gain a use of
> > > the cmake_minimum_required command now anyway to satisfy CMP0000, so
> > > just remove the call in the internal file.
> > > 
> > > M  +0    -29   cmake/modules/FindKDE4Internal.cmake
> > > 
> > > http://commits.kde.org/kdelibs/ddd2b3290d5d7cef9abfba7ce5e15b6c801d531c
> > > 
> > > diff --git a/cmake/modules/FindKDE4Internal.cmake
> > > b/cmake/modules/FindKDE4Internal.cmake index 6527794..7d54b9b 100644
> > > --- a/cmake/modules/FindKDE4Internal.cmake
> > > +++ b/cmake/modules/FindKDE4Internal.cmake
> > > @@ -345,35 +345,6 @@
> > > 
> > >  # Redistribution and use is allowed according to the terms of the BSD
> > > 
> > > license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
> > > 
> > > -
> > > -# this is required now by cmake 2.6 and so must not be skipped by
> > > if(KDE4_FOUND) below -cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
> > > -# set the cmake policies to the 2.4.x compatibility settings (may
> > > change
> > > for KDE 4.3) -cmake_policy(VERSION 2.4.5)
> > > -
> > > -# CMake 2.6, set compatibility behaviour to cmake 2.4
> > > -# this must be executed always, because the CMAKE_MINIMUM_REQUIRED()
> > > command above -# resets the policy settings, so we get a lot of warnings
> > > -
> > > -# CMP0003: add the link paths to the link command as with cmake 2.4
> > > -cmake_policy(SET CMP0003 NEW)
> > > -
> > > -cmake_policy(SET CMP0005 NEW)
> > > -# since cmake 2.6.3: NEW behaviour is that setting policies doesn't
> > > "escape" the file -# where this is done, macros and functions are
> > > executed
> > > with the policies as they -# were when the were defined. Keep the OLD
> > > behaviour so we can set the policies here -# for all KDE software
> > > without
> > > the big warning
> > > -cmake_policy(SET CMP0011 OLD)
> > > -
> > > -# since cmake 2.8.4: when include()ing from inside cmake's module dir,
> > > prefer the files -# in this directory over those from CMAKE_MODULE_PATH
> > > -cmake_policy(SET CMP0017 NEW)
> > > -
> > > -if (POLICY CMP0026)
> > > -  # Don't use the LOCATION target property of buildsystem targets.
> > > -  cmake_policy(SET CMP0026 NEW)
> > > -endif (POLICY CMP0026)
> > > -
> > > 
> > >  # Only do something if it hasn't been found yet
> > >  if(NOT KDE4_FOUND)





More information about the kde-core-devel mailing list