KDE/kdevelop/plugins/managers/cmake/parser

Andreas Pakulat apaku at gmx.de
Wed Feb 11 16:56:44 UTC 2009


On 11.02.09 16:32:48, Aleix Pol Gonzalez wrote:
> SVN commit 924800 by apol:
> 
> Look for libraries in a more cmake-friendly way.
> When dealing with paths, give the current path as a path base for relative paths.
> Fix some errors added yesterday and pointed out by apaku.
> 
> 
>  M  +5 -2      cmakecondition.cpp  
>  M  +8 -2      cmakeprojectvisitor.cpp  
> 
> 
> --- trunk/KDE/kdevelop/plugins/managers/cmake/parser/cmakecondition.cpp #924799:924800
> @@ -149,17 +149,20 @@
>              case EXISTS:
>              {
>                  QString v=*(it2+1);
> -//                 kDebug(9042) << "EXISTS" << v << *it2;
>                  if(v.isEmpty())
>                      kDebug(9042) << "error: no parameter to exist";
>                  else
>                  {
>                      last=false;
> -                    QFileInfo f(v);
> +                    QString dir;
> +                    if(m_vars->contains("CMAKE_CURRENT_SOURCE_DIR"))
> +                        dir=m_vars->value("CMAKE_CURRENT_SOURCE_DIR").first();
> +                    QFileInfo f(dir, v);

Isn't this the same problem as the current-source-dir thing from your last
commit? That is if the argument is already an absolute path this will now
fail.

Andreas

-- 
It's all in the mind, ya know.




More information about the KDevelop-devel mailing list