From 01bcc7d474f80b36502fa8a2f0b7f66f8300c882 Mon Sep 17 00:00:00 2001 From: Stephan Lachnit Date: Fri, 29 Jul 2022 22:05:23 +0200 Subject: [PATCH] Remove ENABLE_DRAFTS option This option added ZMQ_BUILD_DRAFT_API to the compile definitions. However, this should be propagated by libzmq (see https://github.com/zeromq/libzmq/pull/4323 and https://github.com/zeromq/cppzmq/issues/477). Signed-off-by: Stephan Lachnit --- .github/workflows/ci.yml | 1 - CMakeLists.txt | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 785fa7b..36cd26e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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} diff --git a/CMakeLists.txt b/CMakeLists.txt index 05001ad..b45e91d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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