Skip to content

Commit

Permalink
Merge pull request #319 from jongough/updates
Browse files Browse the repository at this point in the history
Update to correct jammy build to ubuntu
  • Loading branch information
jongough authored Jul 30, 2023
2 parents d49849f + 0108a67 commit 643ba85
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion cmake/PluginSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 643ba85

Please sign in to comment.