Skip to content

Commit

Permalink
Merge pull request #382 from jongough/updates
Browse files Browse the repository at this point in the history 
Update to incorporate pull 378 to set correct target architecture for…
  • Loading branch information
@jongough
jongough authored Feb 4, 2024
2 parents b82bb8f + e2006f4 commit 0d6247e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 13 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
## * xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *
#-----------------------------------------------------------------------------
# Frontend2 Author: Jon Gough
# Testplugin(TP) v1.0.291.0 30/12/2023 DD/MM/YYYY format
# Testplugin(TP) v1.0.292.0 0004/02/2024 DD/MM/YYYY format
# buildCI:yes useODAPI:yes validateJSON:yes
# ---------------------------------------------------------------------------
## -- When changing this file do NOT change the order of the sections. -- ##
Expand Down Expand Up @@ -56,9 +56,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 "291")
set(VERSION_PATCH "292")
set(VERSION_TWEAK "0")
set(VERSION_DATE "30/12/2023") #DD/MM/YYYY format
set(VERSION_DATE "04/02/2024") #DD/MM/YYYY format
set(OCPN_MIN_VERSION "ov58")

set(OCPN_API_VERSION_MAJOR "1")
Expand Down
31 changes: 21 additions & 10 deletions cmake/PluginSetup.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,16 +242,27 @@ if(NOT WIN32 AND NOT QT_ANDROID)

else(NOT WIN32 AND NOT QT_ANDROID)
set(ARCH "x86_64")
if(_wx_selected_config MATCHES "androideabi-qt-arm64")
set(ARCH "arm64")
# android cannot used graphics context is wxWidgets as it does not exist
set(wxUSE_GRAPHICS_CONTEXT 0)
endif(_wx_selected_config MATCHES "androideabi-qt-arm64")
if(_wx_selected_config MATCHES "androideabi-qt-armhf")
set(ARCH "armhf")
# android cannot used graphics context is wxWidgets as it does not exist
set(wxUSE_GRAPHICS_CONTEXT 0)
endif(_wx_selected_config MATCHES "androideabi-qt-armhf")
if(MSVC)
string(TOLOWER "${CMAKE_VS_PLATFORM_NAME}" platform_name)
if(platform_name MATCHES "x64")
set(ARCH "x86_64")
elseif(platform_name MATCHES "arm64")
set(ARCH "arm64")
else()
set(ARCH "x86")
endif()
else()
if(_wx_selected_config MATCHES "androideabi-qt-arm64")
set(ARCH "arm64")
# android cannot used graphics context is wxWidgets as it does not exist
set(wxUSE_GRAPHICS_CONTEXT 0)
endif(_wx_selected_config MATCHES "androideabi-qt-arm64")
if(_wx_selected_config MATCHES "androideabi-qt-armhf")
set(ARCH "armhf")
# android cannot used graphics context is wxWidgets as it does not exist
set(wxUSE_GRAPHICS_CONTEXT 0)
endif(_wx_selected_config MATCHES "androideabi-qt-armhf")
endif()
endif(NOT WIN32 AND NOT QT_ANDROID)


Expand Down

2 comments on commit 0d6247e

@rgleason
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jongough I am puzzled here Jon. this says "set correct architecture for Windows" but it starts with

else(NOT WIN32 AND NOT QT_ANDROID)
set(ARCH "x86_64")

I don't understand why there are then changes for windows and android. It seems inconsistent, but what do I know.

@jongough
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is Pavels' change just with the version number changed. I didn't think there was a problem, but I am now so lost on what is valid, what is not and how plugin manager seems to randomly decide what is valid and what is not I have given up trying to chase these things. To me the whole problem comes down to invalid use of xml and what one person 'knows' and 'dictates'. But....

Please sign in to comment.