From dab82b8dae1933ce098230ba67e247d3ca1e374c Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Mon, 23 Dec 2019 21:01:19 +0000
Subject: [PATCH] Include "$(IDEBuildOptions)" macro in compiler options for
 some packages. Issue #36468, patch from Cyrax.

git-svn-id: trunk@62441 -
---
 components/datetimectrls/datetimectrls.lpk         |  8 +++++---
 .../datetimectrls/design/datetimectrlsdsgn.lpk     |  7 +++++--
 .../multithreadprocs/multithreadprocslaz.lpk       | 14 +++++---------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/components/datetimectrls/datetimectrls.lpk b/components/datetimectrls/datetimectrls.lpk
index 749f035135..7086284b2c 100644
--- a/components/datetimectrls/datetimectrls.lpk
+++ b/components/datetimectrls/datetimectrls.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="DateTimeCtrls"/>
     <Type Value="RunAndDesignTime"/>
@@ -17,8 +17,11 @@
           <OptimizationLevel Value="2"/>
         </Optimizations>
       </CodeGeneration>
+      <Other>
+        <CustomOptions Value="$(IDEBuildOptions)"/>
+      </Other>
     </CompilerOptions>
-    <Description Value="TDateTimePicker - the cross-platform control behaving much like VCL's TDateTimePicker. TDBDateTimePicker - the data-aware version of TDateTimePicker"/>
+    <Description Value="TDateTimePicker - the cross-platform control behaving much like VCL&apos;s TDateTimePicker. TDBDateTimePicker - the data-aware version of TDateTimePicker"/>
     <License Value="Modified LGPL"/>
     <Version Major="1" Minor="5" Release="1"/>
     <Files Count="4">
@@ -49,7 +52,6 @@
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
     </PublishOptions>
     <CustomOptions Items="ExternHelp" Version="2">
       <_ExternHelp Items="Count"/>
diff --git a/components/datetimectrls/design/datetimectrlsdsgn.lpk b/components/datetimectrls/design/datetimectrlsdsgn.lpk
index 18a39482a9..36be1d62aa 100644
--- a/components/datetimectrls/design/datetimectrlsdsgn.lpk
+++ b/components/datetimectrls/design/datetimectrlsdsgn.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="DateTimeCtrlsDsgn"/>
     <Type Value="RunAndDesignTime"/>
@@ -13,8 +13,11 @@
         <OtherUnitFiles Value="."/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\$(LCLWidgetType)"/>
       </SearchPaths>
+      <Other>
+        <CustomOptions Value="$(IDEBuildOptions)"/>
+      </Other>
     </CompilerOptions>
-    <Description Value="TDateTimePicker - the cross-platform control behaving much like VCL's TDateTimePicker. TDBDateTimePicker - the data-aware version of TDateTimePicker"/>
+    <Description Value="TDateTimePicker - the cross-platform control behaving much like VCL&apos;s TDateTimePicker. TDBDateTimePicker - the data-aware version of TDateTimePicker"/>
     <License Value="Modified LGPL"/>
     <Version Major="1" Minor="5" Release="1"/>
     <Files Count="3">
diff --git a/components/multithreadprocs/multithreadprocslaz.lpk b/components/multithreadprocs/multithreadprocslaz.lpk
index a16850c3f0..c6c97c0e2e 100644
--- a/components/multithreadprocs/multithreadprocslaz.lpk
+++ b/components/multithreadprocs/multithreadprocslaz.lpk
@@ -1,18 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <Name Value="MultiThreadProcsLaz"/>
+    <Type Value="RunAndDesignTime"/>
     <Author Value="Mattias Gaertner  mattias@freepascal.org"/>
     <CompilerOptions>
-      <Version Value="10"/>
+      <Version Value="11"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Other>
-        <CompilerMessages>
-          <UseMsgFile Value="True"/>
-        </CompilerMessages>
-        <CompilerPath Value="$(CompPath)"/>
+        <CustomOptions Value="$(IDEBuildOptions)"/>
       </Other>
     </CompilerOptions>
     <Description Value="Running procedures and methods parallel via a thread pool."/>
@@ -32,7 +30,6 @@
         <UnitName Value="MTPCPU"/>
       </Item3>
     </Files>
-    <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="1">
       <Item1>
         <PackageName Value="FCL"/>
@@ -45,7 +42,6 @@
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
     </PublishOptions>
   </Package>
 </CONFIG>