diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d07505..e0decdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,8 +64,8 @@ set(LONG_DESCRIPTION set(VERSION_MAJOR "0") set(VERSION_MINOR "1") -set(VERSION_PATCH "162") -set(VERSION_TWEAK "1") +set(VERSION_PATCH "164") +set(VERSION_TWEAK "0") set(VERSION_DATE "14/01/2025") # DD/MM/YYYY format set(OCPN_MIN_VERSION "ov58") @@ -206,18 +206,18 @@ else() set(AVROLIB "libavro.a") endif() -#ExternalProject_Add(zlib -# PREFIX ${CMAKE_BINARY_DIR}/zlib -# SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/zlib -# CMAKE_ARGS -# -DCMAKE_POSITION_INDEPENDENT_CODE=ON -# -DCMAKE_CXX_FLAGS="-fPIC" -# -DCMAKE_C_FLAGS="-fPIC" -# -DBUILD_SHARED_LIBS=OFF -# INSTALL_COMMAND ${CMAKE_COMMAND} -E copy -# "${CMAKE_BINARY_DIR}/zlib/src/zlib-build${LIBDIR}/${ZLIB}" -# "${CMAKE_BINARY_DIR}/${ZLIB}" -# BUILD_ALWAYS TRUE +ExternalProject_Add(zlib + PREFIX ${CMAKE_BINARY_DIR}/zlib + SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/zlib + CMAKE_ARGS + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DCMAKE_CXX_FLAGS="-fPIC" + -DCMAKE_C_FLAGS="-fPIC" + -DBUILD_SHARED_LIBS=OFF + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy + "${CMAKE_BINARY_DIR}/zlib/src/zlib-build${LIBDIR}/${ZLIB}" + "${CMAKE_BINARY_DIR}/${ZLIB}" + BUILD_ALWAYS TRUE ) ExternalProject_Add(jansson PREFIX ${CMAKE_BINARY_DIR}/jansson diff --git a/ci/circleci-build-macos-universal.sh b/ci/circleci-build-macos-universal.sh index 3bacba4..78057d6 100755 --- a/ci/circleci-build-macos-universal.sh +++ b/ci/circleci-build-macos-universal.sh @@ -16,7 +16,7 @@ set -x # Load local environment if it exists i. e., this is a local build if [ -f ~/.config/local-build.rc ]; then source ~/.config/local-build.rc; fi -git submodule update --init opencpn-libs +git submodule update --init # If applicable, restore /usr/local from cache. if [[ -n "$CI" && -f /tmp/local.cache.tar ]]; then diff --git a/cmake/fix-macos-libs.sh b/cmake/fix-macos-libs.sh index 725ebb9..acac030 100755 --- a/cmake/fix-macos-libs.sh +++ b/cmake/fix-macos-libs.sh @@ -6,7 +6,7 @@ readonly RUNTIME_PATH="@executable_path/../Frameworks/" -plugin=$(find . -maxdepth 1 -name '*.dylib') +plugin=$(find . -name '*.dylib') for lib in $(otool -L "$plugin" | awk ' /wx/ {print $1}'); do libdir=${lib%/*} if [ "$libdir" = "$lib" ]; then