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.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0017f2cce75798525a2c899087f52e0098ccf877..2f0218a5d237be91594de0b07fd38397f7dbaf53 100644 (file)
--- 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 3a3cfd49e96f40cb50e904ad980d8f6312a6d117..c5da67d11bd33d9ac662bbfc44a6ee7c9981473c 100644 (file)
--- 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}