diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e8620861..e454a60df 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 "215") +set(VERSION_PATCH "217") set(VERSION_TWEAK "0") -set(VERSION_DATE "07/10/2022") # DD/MM/YYYY format +set(VERSION_DATE "28/11/2022") # DD/MM/YYYY format set(OCPN_MIN_VERSION "ov50") set(OCPN_API_VERSION_MAJOR "1") set(OCPN_API_VERSION_MINOR "16") diff --git a/ci/circleci-build-flatpak.sh b/ci/circleci-build-flatpak.sh index d575eacc1..de9ad5d01 100755 --- a/ci/circleci-build-flatpak.sh +++ b/ci/circleci-build-flatpak.sh @@ -28,6 +28,23 @@ sudo apt-get -q -y --allow-unauthenticated --allow-downgrades --allow-remove-ess sudo apt --allow-unauthenticated --allow-downgrades --allow-remove-essential --allow-change-held-packages install flatpak flatpak-builder +# Install extra build libs +ME=$(echo ${0##*/} | sed 's/\.sh//g') +EXTRA_LIBS=./ci/extras/extra_libs.txt +if test -f "$EXTRA_LIBS"; then + sudo apt update + while read line; do + sudo apt-get install $line + done < $EXTRA_LIBS +fi +EXTRA_LIBS=./ci/extras/${ME}_extra_libs.txt +if test -f "$EXTRA_LIBS"; then + sudo apt update + while read line; do + sudo apt-get install $line + done < $EXTRA_LIBS +fi + if [ -n "$CI" ]; then sudo apt update diff --git a/ci/extras/circleci-build-flatpak_extra_libs.txt b/ci/extras/circleci-build-flatpak_extra_libs.txt new file mode 100644 index 000000000..1ce3f6b9e --- /dev/null +++ b/ci/extras/circleci-build-flatpak_extra_libs.txt @@ -0,0 +1 @@ +libcurl4-openssl-dev diff --git a/ci/extras/extra_libs.txt b/ci/extras/extra_libs.txt new file mode 100644 index 000000000..efaa0f4c2 --- /dev/null +++ b/ci/extras/extra_libs.txt @@ -0,0 +1 @@ +equivs diff --git a/cmake/PluginConfigure.cmake b/cmake/PluginConfigure.cmake index 47ddbfdbe..837c9d064 100644 --- a/cmake/PluginConfigure.cmake +++ b/cmake/PluginConfigure.cmake @@ -259,7 +259,7 @@ if(OCPN_FLATPAK_CONFIG) file(READ ${PLUGIN_FLATPAK_ARGS} finish_args) endif() find_file(PLUGIN_FLATPAK_OPTIONS NAMES flatpak_options.in PATHS cmake/in-files NO_DEFAULT_PATH ) - if(${PLUGIN_FLATPAK_ARGS} STREQUAL "PLUGIN_FLATPAK_OPTIONS-NOTFOUND") + if(${PLUGIN_FLATPAK_OPTIONS} STREQUAL "PLUGIN_FLATPAK_OPTIONS-NOTFOUND") message(STATUS "${CMLOC}PLUGIN_FLATPAK_OPTIONS: Not Found") set(build_options "") else()