Merge pull request #569 from hernando/master

Release 1.12 preparations.

Author: Raphael Dumusc

.gitexternals

@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-# CMake/common https://github.com/Eyescale/CMake.git 5b8d588
+# CMake/common https://github.com/Eyescale/CMake.git 927b438

.gitsubprojects

@@ -1,9 +1,9 @@
 # -*- mode: cmake -*-
-git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git f6fda2d)
+git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 2c931bd)
 git_subproject(Servus https://github.com/HBPVIS/Servus 62873a5)
-git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 883bbb7)
-git_subproject(Pression https://github.com/Eyescale/Pression.git 6d3b6ed)
+git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 30b8b8e)
+git_subproject(Pression https://github.com/Eyescale/Pression.git ce35183)
 git_subproject(hwsd https://github.com/Eyescale/hwsd.git 6211d53)
-git_subproject(Collage https://github.com/Eyescale/Collage.git 3f2ed88)
+git_subproject(Collage https://github.com/Eyescale/Collage.git 382cc17)
 git_subproject(GLStats https://github.com/Eyescale/GLStats.git 2ba6dbc)
-git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 1cb94bc)
+git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 8faf9d1)

CMake/Equalizer.spec

@@ -1,13 +1,13 @@
 Name:		Equalizer
-Version:	1.11.0
+Version:	1.12.0
 Release:	1%{?dist}
 Summary:	Middleware to create and deploy parallel OpenGL-based applications
 
 Group:		Development/Libraries
 License:	LGPLv2, examples are BSD licensed
 URL:		http://www.equalizergraphics.com/
 Source0:	http://www.equalizergraphics.com/downloads/%{name}-%{version}.tar.gz
-Patch0:		Equalizer-1.11.0-build-fix.patch
+Patch0:		Equalizer-1.12.0-build-fix.patch
 BuildRequires:	cmake bison flex
 BuildRequires:	boost-devel glew-devel
 BuildRequires:	libX11-devel mesa-libGL-devel

CMake/GitExternal.cmake

@@ -23,14 +23,17 @@
 #    when only a specific branch of a repo is required and the full history
 #    is not required. Note that the SHALLOW option will only work for a branch
 #    or tag and cannot be used for an arbitrary SHA.
+#  OPTIONAL, when present, this option makes this operation optional.
+#    The function will output a warning and return if the repo could not be
+#    cloned.
 #
 # Targets:
 #  * <directory>-rebase: fetches latest updates and rebases the given external
 #    git repository onto it.
 #  * rebase: Rebases all git externals, including sub projects
 #
 # Options (global) which control behaviour:
-#  GIT_EXTERNAL_VERBOSE
+#  COMMON_GIT_EXTERNAL_VERBOSE
 #    This is a global option which has the same effect as the VERBOSE option,
 #    with the difference that output information will be produced for all
 #    external repos when set.
@@ -53,15 +56,15 @@ if(NOT GIT_EXECUTABLE)
 endif()
 
 include(CMakeParseArguments)
-option(GIT_EXTERNAL_VERBOSE "Print git commands as they are executed" OFF)
+option(COMMON_GIT_EXTERNAL_VERBOSE "Print git commands as they are executed" OFF)
 
 if(NOT GITHUB_USER AND DEFINED ENV{GITHUB_USER})
   set(GITHUB_USER $ENV{GITHUB_USER} CACHE STRING
     "Github user name used to setup remote for 'user' forks")
 endif()
 
 macro(GIT_EXTERNAL_MESSAGE msg)
-  if(GIT_EXTERNAL_VERBOSE OR GIT_EXTERNAL_LOCAL_VERBOSE)
+  if(COMMON_GIT_EXTERNAL_VERBOSE)
     message(STATUS "${NAME}: ${msg}")
   endif()
 endmacro()
@@ -74,7 +77,7 @@ function(JOIN VALUES GLUE OUTPUT)
 endfunction()
 
 function(GIT_EXTERNAL DIR REPO tag)
-  cmake_parse_arguments(GIT_EXTERNAL_LOCAL "VERBOSE;SHALLOW" "" "RESET" ${ARGN})
+  cmake_parse_arguments(GIT_EXTERNAL_LOCAL "VERBOSE;SHALLOW;OPTIONAL" "" "RESET" ${ARGN})
   set(TAG ${tag})
   if(GIT_EXTERNAL_TAG AND "${tag}" MATCHES "^[0-9a-f]+$")
     set(TAG ${GIT_EXTERNAL_TAG})
@@ -115,7 +118,12 @@ function(GIT_EXTERNAL DIR REPO tag)
       RESULT_VARIABLE nok ERROR_VARIABLE error
       WORKING_DIRECTORY "${GIT_EXTERNAL_DIR}")
     if(nok)
-      message(FATAL_ERROR "${DIR} clone failed: ${error}\n")
+      if(GIT_EXTERNAL_LOCAL_OPTIONAL)
+        message(STATUS "${DIR} clone failed: ${error}\n")
+        return()
+      else()
+        message(FATAL_ERROR "${DIR} clone failed: ${error}\n")
+      endif()
     endif()
 
     # checkout requested tag

doc/Changelog.md

@@ -1,7 +1,7 @@
 Changelog {#Changelog}
 =========
 
-# git master
+# Release 1.12 (30-Jul-2016)
 
 * [563](https://github.com/Eyescale/Equalizer/pull/563):
   Add seq::Renderer::requestRedraw()