From b4cd5c3eeec1d33f44e67fa947c279abd63c8dbf Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 11 Nov 2022 08:04:47 -0800
Subject: [PATCH] CMake: fix: stop disabling demand loading in tools

The Autotools build system only disables demand loading in `gvpack` among the
tools, but the CMake build system was disabling it for all tools.
---
 CHANGELOG.md             | 5 +++++
 cmd/tools/CMakeLists.txt | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0017f2cce..2f0218a5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased (7.0.3)]
 
+### Fixed
+
+- The CMake build system no longer builds auxiliary tools beyond `gvpack` with
+  demand loading disabled.
+
 ## [7.0.2] – 2022-11-18
 
 ### Added
diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt
index 3a3cfd49e..c5da67d11 100644
--- a/cmd/tools/CMakeLists.txt
+++ b/cmd/tools/CMakeLists.txt
@@ -282,13 +282,13 @@ tool_defaults(gvgen)
 # =================================== gvpack ===================================
 # TODO add gvpack_static
 
-add_definitions(-DDEMAND_LOADING=0)
-
 add_executable(gvpack
   # Source files
   gvpack.cpp
 )
 
+target_compile_definitions(gvpack PRIVATE DEMAND_LOADING=0)
+
 target_include_directories(gvpack PRIVATE
   ../../lib
   ${CMAKE_CURRENT_SOURCE_DIR}
-- 
2.50.1