Merge pull request #16 from thclark/v0.0.3

V0.0.3
thclark · Jul 30, 2020 · 458d26f · 458d26f
2 parents 9ee61c0 + e076a4f
commit 458d26f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,9 +7,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
 
 # Set make options
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set (CMAKE_CXX_STANDARD 11)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
+# Lets glog play more nicely with Windows
+IF(CMAKE_SYSTEM_NAME STREQUAL Windows)
+    add_definitions(-DGLOG_NO_ABBREVIATED_SEVERITIES)
+endif()
 
 # Add third party tools required by conan
 message("-- Adding dependencies with conan. Make sure you've called `conan install . --install-folder ${CMAKE_BINARY_DIR}`")

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -29,7 +29,7 @@ all the tricky dependencies.
 .. code:: bash
 
     git clone https://github.com/thclark/cpplot
-    cd cpplot && cmake install
+    cd cpplot && cmake . -B build
 
 This process will die first time around, and you'll get a message like:
 

diff --git a/docs/source/version_history.rst b/docs/source/version_history.rst
@@ -80,3 +80,22 @@ Backward Incompatible API Changes
 Bug Fixes & Minor Changes
 -------------------------
 #. n/a (Initial Release)
+
+
+0.0.3
+=====
+
+Minor fixes to build system and docs
+
+New Features
+------------
+#. n/a
+
+Backward Incompatible API Changes
+---------------------------------
+#. n/a
+
+Bug Fixes & Minor Changes
+-------------------------
+#. Fix for building against glog on windows
+#. Corrected build instructions in documentation