More cmake stuff

Change-Id: Ie9907e890cd889d96a31882859d733faa59d6211
Reviewed-on: http://review.couchbase.org/30660
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>