From 9a32138f6aeb08cdb40f168e7b58e5e29fdfc73d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Mon, 23 Sep 2024 16:10:27 +0200 Subject: [PATCH] Revert "Disable bundled libs by deafult" This reverts commit ee72373bd35e098ef4931f1a1b5b60d3a9d2b789. --- CMakeLists.txt | 2 +- README.md | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ff1302..9e945e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden) option(BUILD_SHARED_LIBS "Build using shared libraries" ON) -option(USE_BUNDLED_LIBS "Use bundled LZ4 PugiXML and Zlib. You can still exclude some" OFF) +option(USE_BUNDLED_LIBS "Use bundled LZ4 PugiXML and Zlib. You can still exclude some" ON) cmake_dependent_option(USE_BUNDLED_LZ4 "Use bundled LZ4" ON "USE_BUNDLED_LIBS" OFF) cmake_dependent_option(USE_BUNDLED_PUGIXML "Use bundled PugiXML" ON "USE_BUNDLED_LIBS" OFF) cmake_dependent_option(USE_BUNDLED_ZLIB "Use bundled Zlib" ON "USE_BUNDLED_LIBS" OFF) diff --git a/README.md b/README.md index da2ca85..7e54181 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,7 @@ LibXISF LibXISF is C++ library that can read and write XISF files produced by [PixInsight](https://pixinsight.com/). It implement [XISF 1.0 specification](https://pixinsight.com/doc/docs/XISF-1.0-spec/XISF-1.0-spec.html). -It is licensed under GPLv3 or later. To compile you will need C++17 compiler and zlib, lz4, pugixml and zstd libraries. -Zstd is optional but then you would not be able to open files that use this compression method. +It is licensed under GPLv3 or later. To compile you will need C++17 compiler. To compile simply run these commands ``` @@ -13,6 +12,6 @@ cmake --build build --parallel cmake --install build ``` -If you wish to bundled libraries you will may add `-DUSE_BUNDLED_LIBS=On` to first cmake configuration command. -Then you will need *lz4 pkg-config pugixml zlib* installed. You may also specify `-DBUILD_SHARED_LIBS=Off` -if you want build static lib. +By default it use bundled libraries. If you wish to use external libraries you will may add + `-DUSE_BUNDLED_LIBS=Off` to first command. Then you will need *lz4 pkg-config pugixml zlib* installed. +You may also specify `-DBUILD_SHARED_LIBS=Off` if you want build static lib.