1722329251

Author: Oleh Kulykov

CHANGELOG

@@ -1,6 +1,10 @@
 (Portable, Patched, Package, cross-P-latform) Lzma SDK, libplzma
 
-1.4.5: (current):
+1.4.6: (current):
+- Swift package, Cocoapods: add optional compiller flags.
+- Apple plaftforms: improve version generation.
+
+1.4.5:
 - MinGW support.
 
 1.4.4:

CMakeLists.txt

@@ -33,11 +33,11 @@ set(PACKAGE "libplzma")
 set(CPACK_PACKAGE_NAME "${PACKAGE}")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
 set(CPACK_PACKAGE_VERSION_MINOR "4")
-set(CPACK_PACKAGE_VERSION_PATCH "5")
+set(CPACK_PACKAGE_VERSION_PATCH "6")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
 set(CPACK_PACKAGE_VENDOR "olehkulykov@gmail.com")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
-set(SOVERSION "1.4.5")
+set(SOVERSION "1.4.6")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 set(VERSION "${CPACK_PACKAGE_VERSION}")
 

PLzmaSDK-ObjC.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'PLzmaSDK-ObjC'
-  s.version = '1.4.5'
+  s.version = '1.4.6'
   s.summary = '(Portable, Patched, Package, cross-P-latform) Lzma SDK, libplzma'
   s.homepage = 'https://github.com/OlehKulykov/PLzmaSDK'
   s.source = { :git => s.homepage + '.git', :tag => s.version }

PLzmaSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'PLzmaSDK'
-  s.version = '1.4.5'
+  s.version = '1.4.6'
   s.summary = '(Portable, Patched, Package, cross-P-latform) Lzma SDK, libplzma'
   s.homepage = 'https://github.com/OlehKulykov/PLzmaSDK'
   s.source = { :git => s.homepage + '.git', :tag => s.version }

Package.swift

@@ -19,8 +19,7 @@ let package = Package(
                 cxxSettings: [
                     .define("LIBPLZMA_VERSION_BUILD", to: "858"),
                     .unsafeFlags(["-fPIC", "-fno-rtti"])
-                ]
-        ),
+                ]),
         .target(name: "PLzmaSDK",
                 dependencies: [
                     .target(name: "libplzma")
@@ -30,7 +29,13 @@ let package = Package(
                     .copy("../resources/PrivacyInfo.xcprivacy"),
                 ]),
         .target(name: "plzma_test_files",
-                path: "test_files"),
+                path: "test_files",
+                cSettings: [
+                    .unsafeFlags(["-fPIC"])
+                ],
+                cxxSettings: [
+                    .unsafeFlags(["-fPIC", "-fno-rtti"])
+                ]),
         .testTarget(
             name: "PLzmaSDKTests",
             dependencies: [

README.md

@@ -55,7 +55,7 @@ All optional features are enabled by default, but they might be disabled during
 -----------
 #### Swift Package Manager
 ```swift
-.package(url: "https://github.com/OlehKulykov/PLzmaSDK.git", .exact("1.4.5"))
+.package(url: "https://github.com/OlehKulykov/PLzmaSDK.git", .exact("1.4.6"))
 ```
 
 #### CocoaPods Podfile (Swift)
@@ -64,7 +64,7 @@ use_frameworks!
 platform :ios, '11.0'
 
 target '<REPLACE_WITH_YOUR_TARGET>' do
-    pod 'PLzmaSDK', '1.4.5'
+    pod 'PLzmaSDK', '1.4.6'
 end
 ```
 
@@ -74,7 +74,7 @@ use_frameworks!
 platform :ios, '9.0'
 
 target '<REPLACE_WITH_YOUR_TARGET>' do
-    pod 'PLzmaSDK-ObjC', '1.4.5'
+    pod 'PLzmaSDK-ObjC', '1.4.6'
 end
 ```
 
@@ -86,7 +86,7 @@ end
     "npm": ">=6.0.0"
   },
   "dependencies": {
-    "plzmasdk": "1.4.5"
+    "plzmasdk": "1.4.6"
   }
 }
 ```

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.4.5.{build}
+version: 1.4.6.{build}
 
 
 os: Visual Studio 2019

build.gradle

@@ -19,7 +19,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 26
         versionCode 1
-        versionName "1.4.5"
+        versionName "1.4.6"
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DLIBCLZMA_OPT_ANDROID:BOOL=ON", "-DLIBCLZMA_OPT_STATIC:BOOL=OFF", "-DLIBCLZMA_OPT_TESTS:BOOL=OFF", "-DLIBCLZMA_OPT_BUILD_NUMBER=601"

cmake_tests/CMakeLists.txt

@@ -70,6 +70,28 @@ if (MSVC)
   # https://docs.microsoft.com/en-us/cpp/build/reference/utf-8-set-source-and-executable-character-sets-to-utf-8
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
+  
+else()
+
+  # C with -fPIC
+  check_c_compiler_flag("-fPIC" WITH_FPIC_C)
+  if (WITH_FPIC_C)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+  endif()
+
+  # CXX with -fPIC
+  check_cxx_compiler_flag("-fPIC" WITH_FPIC_CXX)
+  if (WITH_FPIC_CXX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+  endif()
+  
+  # CXX with -fno-rtti
+  check_cxx_compiler_flag("-fno-rtti" WITH_FNO_RTTI_CXX)
+  if (WITH_FNO_RTTI_CXX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+    add_definitions(-DLIBPLZMA_NO_CPP_RTTI=1)
+  endif()
+  
 endif()
 
 set(LIBPLZMA_TESTS

libplzma.h

@@ -44,13 +44,13 @@
 /// and all optional C bindings to the internal C++ part(Core) of the library.
 /// Everything what you need to use this library in C | Objective-C | Swift env. is here.
 
-/// @brief Manualy defined version of the library, i.e. 1.4.5
+/// @brief Manualy defined version of the library, i.e. 1.4.6
 /// The optinal \a LIBPLZMA_VERSION_BUILD might be befined by the CI or CMake or manualy.
 /// Conforms 'Semantic Versioning 2.0.0'.
 /// @link https://semver.org
 #define LIBPLZMA_VERSION_MAJOR 1
 #define LIBPLZMA_VERSION_MINOR 4
-#define LIBPLZMA_VERSION_PATCH 5
+#define LIBPLZMA_VERSION_PATCH 6
 
 // Check Windows
 #if defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(WIN64) || defined(WIN32_LEAN_AND_MEAN)