Commit 6148a1c5 authored by Kenton Varda's avatar Kenton Varda

Merge branch 'master' of github.com:kentonv/capnproto

parents d73bc221 843f0a12
project("Cap'n Proto" CXX) project("Cap'n Proto" CXX)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(VERSION 0.6-dev)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
......
...@@ -37,6 +37,7 @@ update_version() { ...@@ -37,6 +37,7 @@ update_version() {
local OLD_REGEX=${OLD//./[.]} local OLD_REGEX=${OLD//./[.]}
doit sed -i -e "s/$OLD_REGEX/$NEW/g" c++/configure.ac doit sed -i -e "s/$OLD_REGEX/$NEW/g" c++/configure.ac
doit sed -i -e "s/set(VERSION.*)/set(VERSION $NEW)/g" c++/CMakeLists.txt
local NEW_NOTAG=${NEW%%-*} local NEW_NOTAG=${NEW%%-*}
declare -a NEW_ARR=(${NEW_NOTAG//./ }) declare -a NEW_ARR=(${NEW_NOTAG//./ })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment