Skip to content

Remove ENABLE_DRAFTS option #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 12, 2024
Merged

Remove ENABLE_DRAFTS option #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01bcc7d
Remove ENABLE_DRAFTS option
stephanlachnit Jul 29, 2022
2fd8bfc
ci: update to libzmq 4.3.5
stephanlachnit Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
cc: ["gcc-10"]
cxx: ["g++-10"]
drafts: ["ON"]
libzmq: ["4.3.4"]
libzmq: ["4.3.5"]
libzmqbuild: ["cmake"]
include:
# older libzmq and without draft
Expand All @@ -33,15 +33,15 @@ jobs:
cc: "gcc-11"
cxx: "g++-11"
drafts: "OFF"
libzmq: "4.3.4"
libzmq: "4.3.5"
libzmqbuild: "cmake"
# coverage (gcc version should match gcov version)
- os: "ubuntu-20.04"
cppstd: "17"
cc: "gcc-9"
cxx: "g++-9"
drafts: "ON"
libzmq: "4.3.4"
libzmq: "4.3.5"
libzmqbuild: "cmake"
coverage: "-DCOVERAGE=ON"
aptinstall: "lcov"
Expand All @@ -51,15 +51,15 @@ jobs:
cc: "clang-12"
cxx: "clang++-12"
drafts: "ON"
libzmq: "4.3.4"
libzmq: "4.3.5"
libzmqbuild: "cmake"
# macos
- os: "macos-latest"
cppstd: "17"
cc: "clang"
cxx: "clang++"
drafts: "OFF"
libzmq: "4.3.4"
libzmq: "4.3.5"
libzmqbuild: false
brewinstall: "zeromq"
# windows
Expand All @@ -68,15 +68,15 @@ jobs:
cc: "msbuild"
cxx: "msbuild"
drafts: "ON"
libzmq: "4.3.4"
libzmq: "4.3.5"
libzmqbuild: "cmake"
platform: "-Ax64"
- os: "windows-2022"
cppstd: "20"
cc: "msbuild"
cxx: "msbuild"
drafts: "ON"
libzmq: "4.3.4"
libzmq: "4.3.5"
libzmqbuild: "cmake"
platform: "-Ax64"

Expand Down Expand Up @@ -132,7 +132,6 @@ jobs:
run: |
cmake -H. -Bbuild ${{ matrix.platform}} ${{ matrix.coverage }} \
-DCMAKE_BUILD_TYPE=${BUILDTYPE} \
-DENABLE_DRAFTS=${{ matrix.drafts }} \
-DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
cmake --build build --config ${BUILDTYPE} -j ${THREADS}
echo "CPPZMQ=${PWD}/build" >> ${GITHUB_ENV}
Expand Down
12 changes: 0 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,6 @@ if (NOT TARGET libzmq AND NOT TARGET libzmq-static)
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}")

set(CPPZMQ_HEADERS
Expand Down