generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #565 from stephanlachnit/p-remove-draft-api-setting

Browse Source 
Remove ENABLE_DRAFTS option
This commit is contained in:
Gudmundur Adalsteinsson 2024-08-12 16:54:02 +00:00 committed by GitHub
commit 6541dd1ce9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/ci.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
cc: ["gcc-10"] cc: ["gcc-10"]
cxx: ["g++-10"] cxx: ["g++-10"]
drafts: ["ON"] drafts: ["ON"]
libzmq: ["4.3.4"] libzmq: ["4.3.5"]
libzmqbuild: ["cmake"] libzmqbuild: ["cmake"]
include: include:
# older libzmq and without draft # older libzmq and without draft
@ -33,7 +33,7 @@ jobs:
cc: "gcc-11" cc: "gcc-11"
cxx: "g++-11" cxx: "g++-11"
drafts: "OFF" drafts: "OFF"
libzmq: "4.3.4" libzmq: "4.3.5"
libzmqbuild: "cmake" libzmqbuild: "cmake"
# coverage (gcc version should match gcov version) # coverage (gcc version should match gcov version)
- os: "ubuntu-20.04" - os: "ubuntu-20.04"
@ -41,7 +41,7 @@ jobs:
cc: "gcc-9" cc: "gcc-9"
cxx: "g++-9" cxx: "g++-9"
drafts: "ON" drafts: "ON"
libzmq: "4.3.4" libzmq: "4.3.5"
libzmqbuild: "cmake" libzmqbuild: "cmake"
coverage: "-DCOVERAGE=ON" coverage: "-DCOVERAGE=ON"
aptinstall: "lcov" aptinstall: "lcov"
@ -51,7 +51,7 @@ jobs:
cc: "clang-12" cc: "clang-12"
cxx: "clang++-12" cxx: "clang++-12"
drafts: "ON" drafts: "ON"
libzmq: "4.3.4" libzmq: "4.3.5"
libzmqbuild: "cmake" libzmqbuild: "cmake"
# macos # macos
- os: "macos-latest" - os: "macos-latest"
@ -59,7 +59,7 @@ jobs:
cc: "clang" cc: "clang"
cxx: "clang++" cxx: "clang++"
drafts: "OFF" drafts: "OFF"
libzmq: "4.3.4" libzmq: "4.3.5"
libzmqbuild: false libzmqbuild: false
brewinstall: "zeromq" brewinstall: "zeromq"
# windows # windows
@ -68,7 +68,7 @@ jobs:
cc: "msbuild" cc: "msbuild"
cxx: "msbuild" cxx: "msbuild"
drafts: "ON" drafts: "ON"
libzmq: "4.3.4" libzmq: "4.3.5"
libzmqbuild: "cmake" libzmqbuild: "cmake"
platform: "-Ax64" platform: "-Ax64"
- os: "windows-2022" - os: "windows-2022"
@ -76,7 +76,7 @@ jobs:
cc: "msbuild" cc: "msbuild"
cxx: "msbuild" cxx: "msbuild"
drafts: "ON" drafts: "ON"
libzmq: "4.3.4" libzmq: "4.3.5"
libzmqbuild: "cmake" libzmqbuild: "cmake"
platform: "-Ax64" platform: "-Ax64"
@ -132,7 +132,6 @@ jobs:
run: | run: |
cmake -H. -Bbuild ${{ matrix.platform}} ${{ matrix.coverage }} \ cmake -H. -Bbuild ${{ matrix.platform}} ${{ matrix.coverage }} \
-DCMAKE_BUILD_TYPE=${BUILDTYPE} \ -DCMAKE_BUILD_TYPE=${BUILDTYPE} \
-DENABLE_DRAFTS=${{ matrix.drafts }} \
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }} -DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
cmake --build build --config ${BUILDTYPE} -j ${THREADS} cmake --build build --config ${BUILDTYPE} -j ${THREADS}
echo "CPPZMQ=${PWD}/build" >> ${GITHUB_ENV} echo "CPPZMQ=${PWD}/build" >> ${GITHUB_ENV}

12
CMakeLists.txt
View File

@ -26,18 +26,6 @@ if (NOT TARGET libzmq AND NOT TARGET libzmq-static)
endif() endif()
endif() endif()
if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
OPTION (ENABLE_DRAFTS "Build and install draft classes and methods" ON)
else ()
OPTION (ENABLE_DRAFTS "Build and install draft classes and methods" OFF)
endif ()
if (ENABLE_DRAFTS)
ADD_DEFINITIONS (-DZMQ_BUILD_DRAFT_API)
set (pkg_config_defines "-DZMQ_BUILD_DRAFT_API=1")
else (ENABLE_DRAFTS)
set (pkg_config_defines "")
endif (ENABLE_DRAFTS)
message(STATUS "cppzmq v${cppzmq_VERSION}") message(STATUS "cppzmq v${cppzmq_VERSION}")
set(CPPZMQ_HEADERS set(CPPZMQ_HEADERS