Merge branch 'master' into develop

Author: krzysg

CMakeLists.txt

@@ -77,6 +77,7 @@ else()
     set(BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE)
     set(BUILD_SHARED OFF CACHE BOOL "" FORCE)
     set(BUILD_STATIC ON CACHE BOOL "" FORCE)
+    set(PREFER_EXTERNAL_SNAPPY OFF CACHE BOOL "" FORCE)
     add_subdirectory("external/c-blosc")
     include_directories(external/c-blosc/blosc)
     set(BLOSC_LIBRARIES blosc_static)

README.md

@@ -50,6 +50,10 @@ make
 
 This will create the `libapr.so` library in the `build` directory, as well as all of the examples.
 
+### Docker build
+
+We provide working Dockerfile that install the library within the image on a separate [repo](https://github.com/MSusik/libaprdocker).
+
 ### Building on OSX
 
 On OSX, install the `cmake`, `hdf5` and `libtiff`  [homebrew](https://brew.sh) packages and have the [Xcode command line tools](http://osxdaily.com/2014/02/12/install-command-line-tools-mac-os-x/) installed.

cmake-build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 mkdir build
 cd build
-cmake -DAPR_BUILD_STATIC_LIB=1 -DAPR_BUILD_DYNAMIC_LIB=1 -DAPR_EXAMPLES=1 -DAPR_BUILD_EXAMPLES=1 ..
+cmake -DAPR_BUILD_STATIC_LIB=ON -DAPR_BUILD_SHARED_LIB=ON -DAPR_BUILD_EXAMPLES=ON -DAPR_TESTS=ON -DAPR_USE_CUDA=OFF ..
 cmake --build .
 
-# TODO: Add unit test execution
+CTEST_OUTPUT_ON_FAILURE=1 ctest