From: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
Date: Fri, 22 Nov 2024 14:28:16 +0000 (+0100)
Subject: fix-linitian-file-references-package-build-path-downstream
X-Git-Tag: archive/raspbian/2.10.0-4+rpi1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fa0a6827af06306cf8b85f20667fad044da11f6c;p=dune-common.git

fix-linitian-file-references-package-build-path-downstream

Make sure current CXXFLAGS in cmake config files get substituted.

Prevents the build path from appearing in dune-module-config.cmake
files of downstream modules and prevents the lintian warning about
that.

Gbp-Pq: Name fix-linitian-file-references-package-build-path-downstream
---

diff --git a/cmake/modules/DuneProject.cmake b/cmake/modules/DuneProject.cmake
index ea94e31..b795de3 100644
--- a/cmake/modules/DuneProject.cmake
+++ b/cmake/modules/DuneProject.cmake
@@ -290,11 +290,11 @@ set(${ProjectName}_INSTALLED @MODULE_INSTALLED@)
 set_and_check(${ProjectName}_PREFIX \"\${PACKAGE_PREFIX_DIR}\")
 set_and_check(${ProjectName}_INCLUDE_DIRS \"@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@\")
 set(${ProjectName}_CMAKE_CONFIG_VERSION \"${DUNE_COMMON_VERSION}\")
-set(${ProjectName}_CXX_FLAGS \"${CMAKE_CXX_FLAGS}\")
-set(${ProjectName}_CXX_FLAGS_DEBUG \"${CMAKE_CXX_FLAGS_DEBUG}\")
-set(${ProjectName}_CXX_FLAGS_MINSIZEREL \"${CMAKE_CXX_FLAGS_MINSIZEREL}\")
-set(${ProjectName}_CXX_FLAGS_RELEASE \"${CMAKE_CXX_FLAGS_RELEASE}\")
-set(${ProjectName}_CXX_FLAGS_RELWITHDEBINFO \"${CMAKE_CXX_FLAGS_RELWITHDEBINFO}\")
+set(${ProjectName}_CXX_FLAGS \"@CMAKE_CXX_FLAGS@\")
+set(${ProjectName}_CXX_FLAGS_DEBUG \"@CMAKE_CXX_FLAGS_DEBUG@\")
+set(${ProjectName}_CXX_FLAGS_MINSIZEREL \"@CMAKE_CXX_FLAGS_MINSIZEREL@\")
+set(${ProjectName}_CXX_FLAGS_RELEASE \"@CMAKE_CXX_FLAGS_RELEASE@\")
+set(${ProjectName}_CXX_FLAGS_RELWITHDEBINFO \"@CMAKE_CXX_FLAGS_RELWITHDEBINFO@\")
 set(${ProjectName}_DEPENDS \"@${ProjectName}_DEPENDS@\")
 set(${ProjectName}_SUGGESTS \"@${ProjectName}_SUGGESTS@\")
 set(${ProjectName}_MODULE_PATH \"@PACKAGE_DUNE_INSTALL_MODULEDIR@\")