Merge pull request #292 from jongough/updates

Update to latest changes to handle wx32 string correctly and fix typo

CMakeLists.txt

@@ -39,9 +39,9 @@ set(LONG_DESCRIPTION "testplugin Plugin is used to test out the ODraw API and de
 
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "0")
-set(VERSION_PATCH "229")
+set(VERSION_PATCH "230")
 set(VERSION_TWEAK "0")
-set(VERSION_DATE "03/03/2023") # DD/MM/YYYY format
+set(VERSION_DATE "05/03/2023") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov50")
 set(OCPN_API_VERSION_MAJOR "1")
 set(OCPN_API_VERSION_MINOR "16")

cmake/PluginConfigure.cmake

@@ -536,7 +536,7 @@ if(NOT QT_ANDROID)
         string(SUBSTRING ${WX_VER} 0 1 MAJOR)
         string(SUBSTRING ${WX_VER} 1 1 MINOR)
         string(CONCAT WXWIDGETS_FORCE_VERSION ${MAJOR} "." ${MINOR})
-        if(${WX_VER_LEN} = 3)
+        if(${WX_VER_LEN} EQUAL 3)
             string(SUBSTRING ${WX_VER} 2 1 PATCH)
             string(CONCAT WXWIDGETS_FORCE_VERSION ${WXWIDGETS_FORCE_VERSION} "." ${PATCH})
         endif()

cmake/PluginSetup.cmake

@@ -238,10 +238,14 @@ endif(NOT WIN32 AND NOT QT_ANDROID)
 
 message(STATUS "${CMLOC}ARCH: ${ARCH}")
 
-string(STRIP ${PKG_TARGET} PKG_TARGET)
-string(TOLOWER ${PKG_TARGET} PKG_TARGET)
-string(STRIP ${PKG_TARGET_VERSION} PKG_TARGET_VERSION)
-string(TOLOWER ${PKG_TARGET_VERSION} PKG_TARGET_VERSION)
+if(NOT "${PKG_TARGET}" STREQUAL "")
+    string(STRIP ${PKG_TARGET} PKG_TARGET)
+    string(TOLOWER ${PKG_TARGET} PKG_TARGET)
+endif()
+if(NOT "${PKG_TARGET_VERSION}" STREQUAL "")
+    string(STRIP ${PKG_TARGET_VERSION} PKG_TARGET_VERSION)
+    string(TOLOWER ${PKG_TARGET_VERSION} PKG_TARGET_VERSION)
+endif()
 set(PKG_TARGET_NVR ${PKG_TARGET}-${PKG_TARGET_VERSION})
 message(STATUS "${CMLOC}PKG_TARGET: ${PKG_TARGET}, PKG_TARGET_VERSION: ${PKG_TARGET_VERSION}")