Release preparations

.gitignore

@@ -19,7 +19,6 @@ GTAGS
 auxiliary/
 build/
 CMakeLists.txt.user*
-CMake/common
 Makefile
 Collage/
 Deflect/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "CMake/common"]
+	path = CMake/common
+	url = https://github.com/Eyescale/CMake.git

.gitsubprojects

@@ -1,9 +1,9 @@
 # -*- mode: cmake -*-
-git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 126533c)
-git_subproject(Servus https://github.com/HBPVIS/Servus 36180b5)
-git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git f05b9c6)
-git_subproject(Pression https://github.com/Eyescale/Pression.git ae3dded)
-git_subproject(hwsd https://github.com/Eyescale/hwsd.git 2898f91)
-git_subproject(Collage https://github.com/Eyescale/Collage.git 206860e)
-git_subproject(GLStats https://github.com/Eyescale/GLStats.git 836dd5e)
-git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 6c3d21c)
+git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 2635f7f)
+git_subproject(Servus https://github.com/HBPVIS/Servus eee5765)
+git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 867f8d9)
+git_subproject(Pression https://github.com/Eyescale/Pression.git 08cd4bf)
+git_subproject(hwsd https://github.com/Eyescale/hwsd.git 03b6581)
+git_subproject(Collage https://github.com/Eyescale/Collage.git f320324)
+git_subproject(GLStats https://github.com/Eyescale/GLStats.git f9bf19e)
+git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 0d10736)

.travis.yml

@@ -22,5 +22,5 @@ before_install:
 script:
   - mkdir $BUILD_TYPE
   - cd $BUILD_TYPE
-  - cmake -GNinja -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
+  - cmake -GNinja -DCLONE_SUBPROJECTS=ON -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
   - ninja all && ninja $PROJECT_NAME-tests && ninja install

CMakeLists.txt

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2010-2016 Stefan Eilemann <eile@eyescale.ch>
+# Copyright (c) 2010-2017 Stefan Eilemann <eile@eyescale.ch>
 #                         Daniel Pfeifer <daniel@pfeifer-mail.de>
 
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
@@ -8,7 +8,9 @@ set(Equalizer_VERSION_ABI 210)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake
                               ${CMAKE_SOURCE_DIR}/CMake/common)
-include(GitExternal)
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/CMake/common/Common.cmake)
+  message(FATAL_ERROR "CMake/common missing, run: git submodule update --init")
+endif()
 
 set(EQUALIZER_INCLUDE_NAME eq)
 set(EQUALIZER_DEB_DEPENDS bison flex libboost-program-options-dev

README.md

@@ -69,10 +69,10 @@ environment. The following platforms and build environments are tested:
 
 ## Linux, Mac OS X
 
-    git clone https://github.com/Eyescale/Equalizer.git
+    git clone --recursive https://github.com/Eyescale/Equalizer.git
     mkdir Equalizer/build
     cd Equalizer/build
-    cmake -GNinja ..
+    cmake -GNinja -DCLONE_SUBPROJECTS=ON ..
     ninja
 
 ## Windows