[Cmake-commits] CMake branch, master, updated. 0dbd6e8e163ef15ba19581ecd55d49fb4b0dc57f

[cmake-commits at cmake.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  0dbd6e8e163ef15ba19581ecd55d49fb4b0dc57f (commit)
       via  41d6430b52ba52e683bb7fbc98602271f80db287 (commit)
      from  2c156fd18cb97062e6ed8ac655bc4141ffcabf2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dbd6e8e163ef15ba19581ecd55d49fb4b0dc57f
commit 0dbd6e8e163ef15ba19581ecd55d49fb4b0dc57f
Author: Alex Neundorf <neundorf at kde.org>
Date:   Mon Apr 19 18:31:08 2010 +0200

    -add more names for libpng, so it also support libpng 1.4 on Windows (#10551)
    
    Alex

diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 8df3573..bfc5d4a 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -33,7 +33,7 @@ if(ZLIB_FOUND)
   /usr/local/include/libpng             # OpenBSD
   )
 
-  set(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
+  set(PNG_NAMES ${PNG_NAMES} png libpng png14 libpng14 png14d libpng14d png12 libpng12 png12d libpng12d)
   find_library(PNG_LIBRARY NAMES ${PNG_NAMES} )
 
   if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41d6430b52ba52e683bb7fbc98602271f80db287
commit 41d6430b52ba52e683bb7fbc98602271f80db287
Author: Alex Neundorf <neundorf at kde.org>
Date:   Sun Apr 18 11:29:50 2010 +0200

    -don't add the INCLUDE env.var twice to the Eclipse project file
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index fe914fd..204d5d7 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -292,7 +292,6 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     AddEnvVar(fout, "INCLUDE", mf);
     AddEnvVar(fout, "LIB", mf);
     AddEnvVar(fout, "LIBPATH", mf);
-    AddEnvVar(fout, "INCLUDE", mf);
     }
   else if (compilerId == "Intel")
     {

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindPNG.cmake                  |    2 +-
 Source/cmExtraEclipseCDT4Generator.cxx |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake