Skip to content

Commit ab289ba

Browse files
authored
Add SDK_VERSION_SUFFIX for partner id (#203)
build(make): add `SDK_VERSION_SUFFIX` for partner id Add `SDK_VERSION_SUFFIX` to extend `pnsdk` with additional information about implementation / partner.
1 parent 595409b commit ab289ba

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/run-tests.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ jobs:
5555
- name: Setup environment
5656
shell: bash
5757
run: |
58-
sudo apt-get install -y ninja-build libboost-all-dev libssl-dev
58+
sudo apt-get update
59+
sudo apt-get install -y ninja-build libboost-all-dev libssl-dev libgtest-dev nlohmann-json3-dev libasio-dev libtclap-dev g++ cmake
5960
sudo gem install cucumber
6061
- name: Checkout project
6162
uses: actions/checkout@v4
@@ -92,8 +93,9 @@ jobs:
9293
if: steps.cucumber-cpp.outputs.cache-hit != 'true'
9394
shell: bash
9495
run: |
96+
g++ --version
9597
cd ./cucumber-cpp-src
96-
cmake -B build -DCMAKE_BUILD_TYPE=Debug
98+
cmake -B build -DCMAKE_BUILD_TYPE=Debug -DCUKE_TESTS_UNIT=OFF
9799
cmake --build build --config Debug
98100
cd "$GITHUB_WORKSPACE"
99101
mkdir -p cucumber-cpp

CMakeLists.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ endif ()
100100
# Flags configuration
101101

102102
set(FLAGS "\
103-
-g \
104103
-Wall \
105104
-D PUBNUB_THREADSAFE \
106105
-D PUBNUB_LOG_LEVEL=PUBNUB_LOG_LEVEL_${LOG_LEVEL} \
@@ -122,6 +121,12 @@ set(FLAGS "\
122121
-D PUBNUB_USE_LOG_CALLBACK=${USE_LOG_CALLBACK} \
123122
-D PUBNUB_MBEDTLS=${MBEDTLS}")
124123

124+
if (DEFINED SDK_VERSION_SUFFIX)
125+
set(FLAGS "\
126+
${FLAGS} \
127+
-D PUBNUB_SDK_VERSION_SUFFIX=${SDK_VERSION_SUFFIX}")
128+
endif ()
129+
125130
#Required on windows with Event Engine, so only winsock2 is used (otherwise it tries to use winsock and winsock2 and there are redefinition errors)
126131
if (WIN32 OR WIN64 OR MSVC)
127132
set(FLAGS "\
@@ -144,6 +149,7 @@ endif ()
144149
if (${ASAN})
145150
set(FLAGS "\
146151
${FLAGS} \
152+
-g \
147153
-fsanitize=address")
148154
set(LDLIBS "\
149155
${LDLIBS} \

0 commit comments

Comments
 (0)