New cmake tarball needed
David Faure
faure at kde.org
Mon Mar 27 15:07:47 CEST 2006
Personally I use cmake CVS, but for those using the tarball, they need this fix
which makes CMAKE_INCLUDE_CURRENT_DIR work also for srcdir==builddir.
(This is a diff between the 2.3.4 tarball and CVS, at least my last update of it)
--- ../../tmp/cmake-2.3.4-20060317/Source/cmLocalGenerator.cxx 2006-03-16 20:51:54.000000000 +0100
+++ ./cmLocalGenerator.cxx 2006-03-21 18:22:48.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmLocalGenerator.cxx,v $
Language: C++
- Date: $Date: 2006/03/16 19:51:54 $
- Version: $Revision: 1.114 $
+ Date: $Date: 2006/03/21 13:45:57 $
+ Version: $Revision: 1.115 $
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -872,17 +872,14 @@ void cmLocalGenerator::GetIncludeDirecto
bool includeSourceDir = false;
bool includeBinaryDir = false;
- // When automatic include directories are requested for an
- // out-of-source build then include the source and binary
- // directories at the beginning of the include path to approximate
- // include file behavior for an in-source build. This does not
- // account for the case of a source file in a subdirectory of the
- // current source directory but we cannot fix this because not all
- // native build tools support per-source-file include paths.
- bool inSource =
- cmSystemTools::ComparePath(this->Makefile->GetStartDirectory(),
- this->Makefile->GetStartOutputDirectory());
- if(!inSource && this->Makefile->IsOn("CMAKE_INCLUDE_CURRENT_DIR"))
+ // When automatic include directories are requested for a build then
+ // include the source and binary directories at the beginning of the
+ // include path to approximate include file behavior for an
+ // in-source build. This does not account for the case of a source
+ // file in a subdirectory of the current source directory but we
+ // cannot fix this because not all native build tools support
+ // per-source-file include paths.
+ if(this->Makefile->IsOn("CMAKE_INCLUDE_CURRENT_DIR"))
{
includeSourceDir = true;
includeBinaryDir = true;
--
David Faure, faure at kde.org, sponsored by Trolltech to work on KDE,
Konqueror (http://www.konqueror.org), and KOffice (http://www.koffice.org).
More information about the Kde-buildsystem
mailing list