From 0108a67dad0766352fd0841b6cbcdbe321c15d3d Mon Sep 17 00:00:00 2001 From: jongough Date: Sun, 30 Jul 2023 09:21:13 +1000 Subject: [PATCH] Update to correct jammy build to ubuntu --- CMakeLists.txt | 4 ++-- cmake/PluginSetup.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bbd68063..18089f91 100644 --- a/CMakeLists.txt +++ b/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 "248") +set(VERSION_PATCH "249") set(VERSION_TWEAK "0") -set(VERSION_DATE "16/07/2023") # DD/MM/YYYY format +set(VERSION_DATE "30/07/2023") # DD/MM/YYYY format set(OCPN_MIN_VERSION "ov50") set(OCPN_API_VERSION_MAJOR "1") set(OCPN_API_VERSION_MINOR "16") diff --git a/cmake/PluginSetup.cmake b/cmake/PluginSetup.cmake index 0409b642..69a6005b 100644 --- a/cmake/PluginSetup.cmake +++ b/cmake/PluginSetup.cmake @@ -120,7 +120,7 @@ elseif(UNIX) message(STATUS "${CMLOC}PKG_TARGET_WX_VER: ${PKG_TARGET_WX_VER}, WX_VER: $ENV{WX_VER}") elseif(("$ENV{BUILD_ENV}" STREQUAL "ubuntu" OR "$ENV{BUILD_ENV}" STREQUAL "UBUNTU") AND (("$ENV{OCPN_TARGET}" STREQUAL "jammy" OR "$ENV{OCPN_TARGET}" STREQUAL "JAMMY"))) - set(PKG_TARGET "debian") + set(PKG_TARGET "ubuntu") if( NOT "$ENV{WX_VER}" STREQUAL "" ) set(PKG_TARGET_WX_VER "-wx$ENV{WX_VER}") endif()