fix custom bool type for CMake builds (#193)

pubnub · Aug 5, 2024 · 966e078 · 966e078
1 parent 532927a
commit 966e078
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,8 +1,13 @@
 name: c-core
 schema: 1
-version: "4.12.1"
+version: "4.12.2"
 scm: github.com/pubnub/c-core
 changelog:
+  - date: 2024-08-05
+    version: v4.12.2
+    changes:
+      - type: bug
+        text: "Fixed custom `bool` type for CMake builds."
   - date: 2024-08-05
     version: v4.12.1
     changes:
@@ -833,7 +838,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v4.12.1
+            location: https://github.com/pubnub/c-core/releases/tag/v4.12.2
             requires:
               -
                 name: "miniz"
@@ -899,7 +904,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v4.12.1
+            location: https://github.com/pubnub/c-core/releases/tag/v4.12.2
             requires:
               -
                 name: "miniz"
@@ -965,7 +970,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v4.12.1
+            location: https://github.com/pubnub/c-core/releases/tag/v4.12.2
             requires:
               -
                 name: "miniz"
@@ -1027,7 +1032,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v4.12.1
+            location: https://github.com/pubnub/c-core/releases/tag/v4.12.2
             requires:
               -
                 name: "miniz"
@@ -1088,7 +1093,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v4.12.1
+            location: https://github.com/pubnub/c-core/releases/tag/v4.12.2
             requires:
               -
                 name: "miniz"
@@ -1144,7 +1149,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v4.12.1
+            location: https://github.com/pubnub/c-core/releases/tag/v4.12.2
             requires:
               -
                 name: "miniz"
@@ -1197,7 +1202,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v4.12.1
+            location: https://github.com/pubnub/c-core/releases/tag/v4.12.2
             requires:
               -
                 name: "miniz"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v4.12.2
+August 05 2024
+
+#### Fixed
+- Fixed custom `bool` type for CMake builds.
+
 ## v4.12.1
 August 05 2024
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -145,10 +145,10 @@ if(${WITH_CPP})
 endif()
 
 if(NOT ${CUSTOM_BOOL_TYPE} STREQUAL "")
-    message(STATUS "Using custom bool type: ${BOOL_TYPE}")
+    message(STATUS "Using custom bool type: ${CUSTOM_BOOL_TYPE}")
     set(FLAGS "\
         ${FLAGS} \
-        -D PUBNUB_BOOL_TYPE=${BOOL_TYPE}")
+        -D PUBNUB_BOOL_TYPE=${CUSTOM_BOOL_TYPE}")
 endif()
 
 set(CORE_SOURCEFILES 
@@ -502,6 +502,10 @@ if(NOT ESP_PLATFORM)
 
     add_library(pubnub ${LIBTYPE} ${SOURCEFILES})
 
+    if(NOT ${CUSTOM_BOOL_TYPE} STREQUAL "")
+        target_compile_definitions(pubnub PUBLIC PUBNUB_BOOL_TYPE=${CUSTOM_BOOL_TYPE})
+    endif()
+
     target_include_directories(pubnub PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}
         ${CMAKE_CURRENT_LIST_DIR}/core 

diff --git a/core/pubnub_version_internal.h b/core/pubnub_version_internal.h
@@ -3,7 +3,7 @@
 #define INC_PUBNUB_VERSION_INTERNAL
 
 
-#define PUBNUB_SDK_VERSION "4.12.1"
+#define PUBNUB_SDK_VERSION "4.12.2"
 
 
 #endif /* !defined INC_PUBNUB_VERSION_INTERNAL */