Release preparations

Author: Stefan Eilemann

.gitexternals

@@ -40,7 +40,6 @@ tests/client/configVisitor_objc.mm
 tests/image/images/out_*
 tt.*
 tt?.*
-CMake/common
 Lunchbox
 Pression
 Servus

.gitignore

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

.gitmodules

@@ -1,4 +1,4 @@
 # -*- mode: cmake -*-
-git_subproject(Servus https://github.com/HBPVIS/Servus.git 36180b5)
-git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git f05b9c6)
-git_subproject(Pression https://github.com/Eyescale/Pression.git bde7574)
+git_subproject(Servus https://github.com/HBPVIS/Servus.git eee5765)
+git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 867f8d9)
+git_subproject(Pression https://github.com/Eyescale/Pression.git 08cd4bf)

.gitsubprojects

@@ -21,5 +21,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

.travis.yml

@@ -7,9 +7,10 @@ project(Collage VERSION 1.7.0)
 set(Collage_VERSION_ABI 7)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake
-  ${CMAKE_SOURCE_DIR}/CMake/common)
-
-include(GitExternal)
+                              ${CMAKE_SOURCE_DIR}/CMake/common)
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/CMake/common/Common.cmake)
+  message(FATAL_ERROR "CMake/common missing, run: git submodule update --init")
+endif()
 
 option(COLLAGE_BUILD_V2_API
   "Enable for pure 2.0 API (breaks compatibility with 1.x API)" OFF)

CMake/GitExternal.cmake

@@ -55,8 +55,8 @@ environments are tested:
 
 Building from source is as simple as:
 
-    git clone https://github.com/Eyescale/Collage.git
+    git clone --recursive https://github.com/Eyescale/Collage.git
     mkdir Collage/build
     cd Collage/build
-    cmake -GNinja ..
+    cmake -GNinja .. -DCLONE_SUBPROJECTS=ON
     ninja

CMake/common

@@ -203,7 +203,7 @@ class Connection : public lunchbox::Referenced, public boost::noncopyable
     CO_API bool recvSync(BufferPtr& buffer, const bool block = true);
 
     BufferPtr resetRecvData(); //!< @internal
-    //@}
+                               //@}
 
     /** @name Synchronous write to the connection */
     //@{