[Cmake-commits] CMake branch, master, updated. v2.8.11.1-327-g9f160c5

2013-06-20 Thread Kitware Robot 
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  9f160c5b0a7e0f821ca4737638edbebf0ed398be (commit)
  from  7c61c73fbc1c508a6622b444e06c7fc9a0c280f1 (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=9f160c5b0a7e0f821ca4737638edbebf0ed398be
commit 9f160c5b0a7e0f821ca4737638edbebf0ed398be
Author: Kitware Robot 
AuthorDate: Fri Jun 21 00:01:04 2013 -0400
Commit: Kitware Robot 
CommitDate: Fri Jun 21 00:01:04 2013 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a08de90..0b20214 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -2,5 +2,5 @@
 set(CMake_VERSION_MAJOR 2)
 set(CMake_VERSION_MINOR 8)
 set(CMake_VERSION_PATCH 11)
-set(CMake_VERSION_TWEAK 20130620)
+set(CMake_VERSION_TWEAK 20130621)
 #set(CMake_VERSION_RC 1)

---

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


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2677-g03604c1

2013-06-20 Thread Brad King 
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, next has been updated
   via  03604c1d9729ca23191e38c22c9c4ddea43da7f8 (commit)
   via  86cbd7312a766485eb26219c197b78ae079d44a3 (commit)
   via  7c61c73fbc1c508a6622b444e06c7fc9a0c280f1 (commit)
  from  0f736f09a391fca1eeebce3d5d0257e28d2ab187 (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=03604c1d9729ca23191e38c22c9c4ddea43da7f8
commit 03604c1d9729ca23191e38c22c9c4ddea43da7f8
Merge: 0f736f0 86cbd73
Author: Brad King 
AuthorDate: Thu Jun 20 17:15:53 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jun 20 17:15:53 2013 -0400

Merge topic 'FindBoost-error-reason-static' into next

86cbd73 FindBoost: Clarify failure on missing 'static' libs (#14235)
7c61c73 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86cbd7312a766485eb26219c197b78ae079d44a3
commit 86cbd7312a766485eb26219c197b78ae079d44a3
Author: Brad King 
AuthorDate: Thu Jun 20 17:05:00 2013 -0400
Commit: Brad King 
CommitDate: Thu Jun 20 17:10:13 2013 -0400

FindBoost: Clarify failure on missing 'static' libs (#14235)

When Boost_USE_STATIC_LIBS is ON we may complain that Boost libraries
cannot be found even when shared libraries are present.  Update the
error message to tell the user explicitly that we want static libraries.

Suggested-by: Laurence R. McGlashan 

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index d1ce2f4..4cc32be 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1020,7 +1020,12 @@ if(Boost_FOUND)
 # We were unable to find some libraries, so generate a sensible
 # error message that lists the libraries we were unable to find.
 set(Boost_ERROR_REASON
-  "${Boost_ERROR_REASON}\nThe following Boost libraries could not be 
found:\n")
+  "${Boost_ERROR_REASON}\nCould not find the following")
+if(Boost_USE_STATIC_LIBS)
+  set(Boost_ERROR_REASON "${Boost_ERROR_REASON} static")
+endif()
+set(Boost_ERROR_REASON
+  "${Boost_ERROR_REASON} Boost libraries:\n")
 foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
   set(Boost_ERROR_REASON
 "${Boost_ERROR_REASON}boost_${COMPONENT}\n")

---

Summary of changes:
 Modules/FindBoost.cmake   |7 ++-
 Source/CMakeVersion.cmake |2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2674-g0f736f0

2013-06-20 Thread Brad King 
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, next has been updated
   via  0f736f09a391fca1eeebce3d5d0257e28d2ab187 (commit)
   via  508e8ca024e47baea342da85c7bbd014c7fd6c30 (commit)
   via  8dca8cee8afcaa448e8a83e193017d3514e80da5 (commit)
  from  6ae9c417a348009a46f143f7f7ff5d2752e52ffb (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=0f736f09a391fca1eeebce3d5d0257e28d2ab187
commit 0f736f09a391fca1eeebce3d5d0257e28d2ab187
Merge: 6ae9c41 508e8ca
Author: Brad King 
AuthorDate: Thu Jun 20 08:53:25 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jun 20 08:53:25 2013 -0400

Merge topic 'FindGTK2-tweaks' into next

508e8ca FindGTK2: Detect gthread library
8dca8ce FindGTK2: Move check for pangocairo in gtk module


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=508e8ca024e47baea342da85c7bbd014c7fd6c30
commit 508e8ca024e47baea342da85c7bbd014c7fd6c30
Author: Daniele E. Domenichelli 
AuthorDate: Mon Jun 17 17:31:10 2013 +0200
Commit: Daniele E. Domenichelli 
CommitDate: Wed Jun 19 23:58:47 2013 +0200

FindGTK2: Detect gthread library

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 9d0f17f..f398c79 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -164,6 +164,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
 cairo
 cairomm-1.0
 gdk-pixbuf-2.0
+gthread-2.0
 gdkmm-2.4
 giomm-2.4
 gtk-2.0
@@ -465,6 +466,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
 _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR 
gdk-pixbuf/gdk-pixbuf.h)
 _GTK2_FIND_LIBRARY(GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true)
 
+_GTK2_FIND_LIBRARY(GTK2_GTHREAD_LIBRARY gthread false true)
+
 _GTK2_FIND_LIBRARY(GTK2_GIO_LIBRARY gio false true)
 
 _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dca8cee8afcaa448e8a83e193017d3514e80da5
commit 8dca8cee8afcaa448e8a83e193017d3514e80da5
Author: Daniele E. Domenichelli 
AuthorDate: Sat Jun 15 00:53:56 2013 +0200
Commit: Daniele E. Domenichelli 
CommitDate: Wed Jun 19 23:58:47 2013 +0200

FindGTK2: Move check for pangocairo in gtk module

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 06cf962..9d0f17f 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -460,6 +460,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
 _GTK2_FIND_INCLUDE_DIR(GTK2_PANGO_INCLUDE_DIR pango/pango.h)
 _GTK2_FIND_LIBRARY(GTK2_PANGO_LIBRARY pango false true)
 
+_GTK2_FIND_LIBRARY(GTK2_PANGOCAIRO_LIBRARY pangocairo false true)
+
 _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR 
gdk-pixbuf/gdk-pixbuf.h)
 _GTK2_FIND_LIBRARY(GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true)
 
@@ -489,8 +491,6 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
 _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMMCONFIG_INCLUDE_DIR pangommconfig.h)
 _GTK2_FIND_LIBRARY(GTK2_PANGOMM_LIBRARY pangomm true true)
 
-_GTK2_FIND_LIBRARY(GTK2_PANGOCAIRO_LIBRARY pangocairo true true)
-
 _GTK2_FIND_INCLUDE_DIR(GTK2_CAIROMM_INCLUDE_DIR cairomm/cairomm.h)
 _GTK2_FIND_INCLUDE_DIR(GTK2_CAIROMMCONFIG_INCLUDE_DIR cairommconfig.h)
 _GTK2_FIND_LIBRARY(GTK2_CAIROMM_LIBRARY cairomm true true)

---

Summary of changes:
 Modules/FindGTK2.cmake |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2671-g6ae9c41

2013-06-20 Thread Brad King 
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, next has been updated
   via  6ae9c417a348009a46f143f7f7ff5d2752e52ffb (commit)
   via  488d9682cc0974713315cae60a8dae793caefc6a (commit)
  from  fcdc24b725e8faf3a64b06ae9b1cda7597469627 (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=6ae9c417a348009a46f143f7f7ff5d2752e52ffb
commit 6ae9c417a348009a46f143f7f7ff5d2752e52ffb
Merge: fcdc24b 488d968
Author: Brad King 
AuthorDate: Thu Jun 20 08:50:08 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jun 20 08:50:08 2013 -0400

Merge topic 'FindX11-OSX-10.8' into next

488d968 FindX11: Search in /opt/X11 for OS X 10.8 (#14232)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=488d9682cc0974713315cae60a8dae793caefc6a
commit 488d9682cc0974713315cae60a8dae793caefc6a
Author: Marius Schamschula 
AuthorDate: Wed Jun 19 14:43:00 2013 -0400
Commit: Brad King 
CommitDate: Thu Jun 20 08:47:12 2013 -0400

FindX11: Search in /opt/X11 for OS X 10.8 (#14232)

As of Mac OS X 10.8, X11 is no longer installed under /usr/X11, but
under /opt/X11.

diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 3cd3cef..131d979 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -68,6 +68,7 @@ if (UNIX)
 /usr/openwin/include
 /usr/openwin/share/include
 /opt/graphics/OpenGL/include
+/opt/X11/include
   )
 
   set(X11_LIB_SEARCH_PATH
@@ -75,6 +76,7 @@ if (UNIX)
 /usr/X11R6/lib
 /usr/X11R7/lib
 /usr/openwin/lib
+/opt/X11/lib
   )
 
   find_path(X11_X11_INCLUDE_PATH X11/X.h 
${X11_INC_SEARCH_PATH})

---

Summary of changes:
 Modules/FindX11.cmake |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits