diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c2a8f5a..39b8d381 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ PROJECT(PolyVox)
 SET(POLYVOX_VERSION_MAJOR "0")
 SET(POLYVOX_VERSION_MINOR "1")
 SET(POLYVOX_VERSION_PATCH "0")
-SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX_VERSION_PATCH}")
+SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX_VERSION_PATCH}" CACHE STRING "PolyVox version")
 
 include(FeatureSummary)
 
@@ -42,13 +42,13 @@ IF(ENABLE_EXAMPLES)
 	ADD_SUBDIRECTORY(examples/Paging)
 	ADD_SUBDIRECTORY(examples/OpenGL)
 	ADD_SUBDIRECTORY(examples/SmoothLOD)
-	if(BUILD_STATIC_LIBRARIES)
+	if(ENABLE_STATIC_LIBRARIES)
 		ADD_DEPENDENCIES(BasicExample PolyVoxCoreStatic PolyVoxUtilStatic)
 		ADD_DEPENDENCIES(PagingExample PolyVoxCoreStatic PolyVoxUtilStatic)
 		ADD_DEPENDENCIES(OpenGLExample PolyVoxCoreStatic PolyVoxUtilStatic)
 		ADD_DEPENDENCIES(SmoothLODExample PolyVoxCoreStatic PolyVoxUtilStatic)
 	endif()
-	if(BUILD_DYNAMIC_LIBRARIES)
+	if(ENABLE_DYNAMIC_LIBRARIES)
 		ADD_DEPENDENCIES(BasicExample PolyVoxCoreDynamic PolyVoxUtilDynamic)
 		ADD_DEPENDENCIES(PagingExample PolyVoxCoreDynamic PolyVoxUtilDynamic)
 		ADD_DEPENDENCIES(OpenGLExample PolyVoxCoreDynamic PolyVoxUtilDynamic)
diff --git a/INSTALL.txt b/INSTALL.txt
index f413a304..f10e6ce2 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -123,7 +123,7 @@ You need CMake installed so get the binary distribution from `CMake.org <http://
 
 Point the source directory to the directory holding this file and the build directory to the ``build`` subdirectory. Then, click the ``Configure`` button. Click through the dialog box that appears and once you've clicked ``Finish`` you should see text appearing in the bottom text area. Once this has finished, some options will appear in the top area. The purpose of these options in detailed in the Linux→CMake section above. Once you have set these options to what you please, click ``Configure`` again. If it completes without errors then you can click ``Generate`` which will generate your compilers project files in the build directory.
 
-Note that while on Linux it is possible to build both static and dynamic versions of the libraries, this is not possible on Windows. By default static libraries are built. If you want dynamic libraries (``.dll``) then make sure the ``BUILD_STATIC_LIBRARIES`` option is disabled and the ``BUILD_DYNAMIC_LIBRARIES`` option is enabled in the CMake GUI and reconfigure.
+Note that while on Linux it is possible to build both static and dynamic versions of the libraries, this is not possible on Windows. By default static libraries are built. If you want dynamic libraries (``.dll``) then make sure the ``ENABLE_STATIC_LIBRARIES`` option is disabled and the ``ENABLE_DYNAMIC_LIBRARIES`` option is enabled in the CMake GUI and reconfigure.
 
 Building
 --------
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e003bdef..ce2b426a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -14,10 +14,10 @@ MACRO(CREATE_TEST headerfile sourcefile executablename)
 	ELSE(WIN32)
 		SET(LATEST_TEST ${CMAKE_CURRENT_BINARY_DIR}/${executablename})
 	ENDIF(WIN32)
-	if(BUILD_STATIC_LIBRARIES)
+	if(ENABLE_STATIC_LIBRARIES)
 		ADD_DEPENDENCIES(${executablename} PolyVoxCoreStatic PolyVoxUtilStatic)
 	endif()
-	if(BUILD_DYNAMIC_LIBRARIES)
+	if(ENABLED_DYNAMIC_LIBRARIES)
 		ADD_DEPENDENCIES(${executablename} PolyVoxCoreDynamic PolyVoxUtilDynamic)
 	endif()
 ENDMACRO(CREATE_TEST)