Merge pull request #2 from nohal/master

Align the version with the latest tag
rgleason · May 16, 2018 · 426d0c6 · 426d0c6
2 parents a62f6c8 + f4812b6
commit 426d0c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,4 +1,4 @@
 SET(PLUGIN_VERSION_MAJOR "0")
-SET(PLUGIN_VERSION_MINOR "4")
+SET(PLUGIN_VERSION_MINOR "5")
 SET(PLUGIN_VERSION_PATCH "000")
-SET(PLUGIN_VERSION_DATE "2018-5-11")
+SET(PLUGIN_VERSION_DATE "2018-5-15")
diff --git a/cmake/PluginConfigure.cmake b/cmake/PluginConfigure.cmake
@@ -57,6 +57,10 @@ ENDIF(MSVC)
 SET(wxWidgets_USE_LIBS base core net xml html adv)
 SET(BUILD_SHARED_LIBS TRUE)
 
+set (WXWIDGETS_FORCE_VERSION CACHE VERSION "Force usage of a specific wxWidgets version.")
+if(WXWIDGETS_FORCE_VERSION)
+  set (wxWidgets_CONFIG_OPTIONS --version=${WXWIDGETS_FORCE_VERSION})
+endif()
 FIND_PACKAGE(wxWidgets REQUIRED)
 
 IF(MSYS)