Update project version in cmake, minor tweaks to readme

CMakeLists.txt

@@ -50,18 +50,22 @@ if(POLICY CMP0074)
 	cmake_policy(SET CMP0074 NEW)
 endif(POLICY CMP0074)
 
-project(RmlUi C CXX)
+project(RmlUi LANGUAGES C CXX VERSION 3.0)
+
+set(RMLUI_VERSION_RELEASE false)
+
+if(RMLUI_VERSION_RELEASE)
+	set(RMLUI_VERSION_SUFFIX "")
+else()
+	set(RMLUI_VERSION_SUFFIX "-dev")
+endif()
+
+set(RMLUI_VERSION_SHORT ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}${RMLUI_VERSION_SUFFIX})
+add_compile_definitions(RMLUI_VERSION="${RMLUI_VERSION_SHORT}")
 
 # paths
 include(GNUInstallDirs)
 
-set(RMLUI_VERSION_MAJOR 3)
-set(RMLUI_VERSION_MINOR 0)
-set(RMLUI_VERSION_PATCH 0)
-set(RMLUI_VERSION_TWEAK "-dev")
-set(PROJECT_VERSION ${RMLUI_VERSION_MAJOR}.${RMLUI_VERSION_MINOR}.${RMLUI_VERSION_PATCH}${RMLUI_VERSION_TWEAK})
-add_compile_definitions(RMLUI_VERSION="${PROJECT_VERSION}")
-
 # Search in the 'cmake' directory for additional CMake modules.
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake;${PROJECT_SOURCE_DIR}/CMake/Modules)
 
@@ -228,7 +232,7 @@ foreach(library ${LIBRARIES})
 
 	set_target_properties(${NAME} PROPERTIES
 	   VERSION ${PROJECT_VERSION}
-	   SOVERSION ${RMLUI_VERSION_MAJOR}
+	   SOVERSION ${PROJECT_VERSION_MAJOR}
 	)
 	
 	if (MSVC)
@@ -284,7 +288,7 @@ else(NOT BUILD_FRAMEWORK)
 
 	set_target_properties(${NAME} PROPERTIES
 		VERSION ${PROJECT_VERSION}
-		SOVERSION ${RMLUI_VERSION_MAJOR}
+		SOVERSION ${PROJECT_VERSION_MAJOR}
 	)
 
 	set_property(SOURCE ${MASTER_PUB_HDR_FILES}
@@ -303,7 +307,7 @@ else(NOT BUILD_FRAMEWORK)
 		FRAMEWORK TRUE
 		FRAMEWORK_VERSION ${PROJECT_VERSION}
 		MACOSX_FRAMEWORK_IDENTIFIER com.rmlui.${NAME}
-		MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${RMLUI_VERSION_MAJOR}.${RMLUI_VERSION_MINOR}.${RMLUI_VERSION_PATCH}.${RMLUI_VERSION_TWEAK}
+		MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${RMLUI_VERSION_SHORT}
 		MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}
 		XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
 		PUBLIC_HEADER ${MASTER_PUB_HDR_FILES}
@@ -334,7 +338,7 @@ if(BUILD_LUA_BINDINGS)
 
 		set_target_properties(${NAME} PROPERTIES
 		   VERSION ${PROJECT_VERSION}
-		   SOVERSION ${RMLUI_VERSION_MAJOR}
+		   SOVERSION ${PROJECT_VERSION_MAJOR}
 		)
 
 		set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 14)

Samples/readme.md

@@ -34,7 +34,7 @@ use of RmlUi in small, easy to understand applications.
  * shell       - Common platform specific code used by all the 
                  samples for open windows, processing input and 
                  access files.
-                 Supports Windows, MacOS and Linux
+                 Supports Windows, macOS and Linux
                
  * tutorial    - Tutorial code that should be used in conjunction
                  with the tutorials on the RmlUi website.

readme.md

@@ -10,7 +10,7 @@ RmlUi - now with added boosters taking control of the rocket, targeting *your* g
 
 RmlUi is the C++ user interface package based on the HTML and CSS standards, designed as a complete solution for any project's interface needs. It is a fork of the [libRocket](https://github.com/libRocket/libRocket) project, introducing new features, bug fixes, and performance improvements. 
 
-RmlUi uses the time-tested open standards XHTML1.0 and CSS2.0 while borrowing features from HTML5 and CSS3, and extends them with features suited towards real-time applications. Because of this, you don't have to learn a whole new proprietary technology like other libraries in this space. Please have a look at the [element index](https://mikke89.github.io/RmlUiDoc/pages/rml/element_index.html) and the supported [properties](https://mikke89.github.io/RmlUiDoc/pages/rcss/property_index.html).
+RmlUi uses the time-tested open standards XHTML1.0 and CSS2.0 while borrowing features from HTML5 and CSS3, and extends them with features suited towards real-time applications. Because of this, you don't have to learn a whole new proprietary technology like other libraries in this space. Please have a look at the supported [RCSS properties](https://mikke89.github.io/RmlUiDoc/pages/rcss/property_index.html) and [RML elements](https://mikke89.github.io/RmlUiDoc/pages/rml/element_index.html).
 
 Documentation is located at https://mikke89.github.io/RmlUiDoc/
 
@@ -22,13 +22,13 @@ Documentation is located at https://mikke89.github.io/RmlUiDoc/
 - Efficient application-wide styling, with a custom-built templating engine.
 - Fully featured control set: buttons, sliders, drop-downs, etc.
 - Runtime visual debugging suite.
-- Easily integrated and extensible with Lua scripting.
 
 ## Extensible
 
 - Abstracted interfaces for plugging in to any game engine.
 - Decorator engine allowing custom application-specific effects that can be applied to any element.
 - Generic event system that binds seamlessly into existing projects.
+- Easily integrated and extensible with Lua scripting.
 
 ## Controllable