Remove OPTIONS "-U__MINGW32__" from gaudi_add_dictionary directive

Conflicts:
	Phys/AnalysisPython/CMakeLists.txt
	Phys/LoKiAlgoMC/CMakeLists.txt
	Phys/LoKiGenMC/CMakeLists.txt
	Phys/LoKiPhysMC/CMakeLists.txt
	Phys/Particle2MCTruth/CMakeLists.txt

Phys/AnalysisPython/CMakeLists.txt

 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -8,9 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-################################################################################
-# Package: AnalysisPython
-################################################################################
 gaudi_subdir(AnalysisPython)
 
 gaudi_depends_on_subdirs(GaudiPython
@@ -37,8 +34,7 @@ gaudi_add_dictionary(AnalysisPython
                      dict/AnalysisPython.xml
                      INCLUDE_DIRS ROOT
                      LINK_LIBRARIES ROOT GaudiPythonLib LHCbMathLib AnalysisPythonLib
-                     SPLIT_CLASSDEF
-                     OPTIONS -U__MINGW32__)
+                     SPLIT_CLASSDEF)
 
 # Ensure that the library and the dictionary are built in the right order and
 # not multiple times.

Phys/LoKiAlgoMC/CMakeLists.txt

 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -8,9 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-################################################################################
-# Package: LoKiAlgoMC
-################################################################################
 gaudi_subdir(LoKiAlgoMC)
 
 gaudi_depends_on_subdirs(GaudiPython
@@ -41,8 +38,7 @@ gaudi_add_dictionary(LoKiAlgoMC
                      dict/LoKiAlgoMCDict.h
                      dict/LoKiAlgoMC.xml
                      INCLUDE_DIRS PythonLibs PythonLibs Kernel/MCInterfaces
-                     LINK_LIBRARIES PythonLibs PythonLibs LoKiAlgo LoKiGenMCLib LoKiPhysMCLib GaudiPythonLib LoKiAlgoMCLib
-                     OPTIONS " -U__MINGW32__ ")
+                     LINK_LIBRARIES PythonLibs PythonLibs LoKiAlgo LoKiGenMCLib LoKiPhysMCLib GaudiPythonLib LoKiAlgoMCLib)
 
 gaudi_install_python_modules()
 

Phys/LoKiGenMC/CMakeLists.txt

 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -8,9 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-################################################################################
-# Package: LoKiGenMC
-################################################################################
 gaudi_subdir(LoKiGenMC)
 
 gaudi_depends_on_subdirs(Kernel/Relations
@@ -34,8 +31,7 @@ gaudi_add_module(LoKiGenMC
 gaudi_add_dictionary(LoKiGenMC
                      dict/LoKiGenMCDict.h
                      dict/LoKiGenMC.xml
-                     LINK_LIBRARIES RelationsLib DaVinciMCKernelLib LoKiGenLib LoKiMCLib LoKiGenMCLib
-                     OPTIONS " -U__MINGW32__ ")
+                     LINK_LIBRARIES RelationsLib DaVinciMCKernelLib LoKiGenLib LoKiMCLib LoKiGenMCLib)
 
 gaudi_install_python_modules()
 

Phys/LoKiPhysMC/CMakeLists.txt

 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -8,9 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-################################################################################
-# Package: LoKiPhysMC
-################################################################################
 gaudi_subdir(LoKiPhysMC)
 
 gaudi_depends_on_subdirs(Event/LinkerEvent
@@ -36,8 +33,7 @@ gaudi_add_module(LoKiPhysMC
 gaudi_add_dictionary(LoKiPhysMC
                      dict/LoKiPhysMCDict.h
                      dict/LoKiPhysMC.xml
-                     LINK_LIBRARIES LinkerEvent RelationsLib DaVinciMCKernelLib LoKiGenMCLib LoKiMCLib LoKiPhysLib LoKiPhysMCLib
-                     OPTIONS " -U__MINGW32__ ")
+                     LINK_LIBRARIES LinkerEvent RelationsLib DaVinciMCKernelLib LoKiGenMCLib LoKiMCLib LoKiPhysLib LoKiPhysMCLib)
 
 gaudi_install_python_modules()
 

Phys/Particle2MCTruth/CMakeLists.txt

 ###############################################################################
-# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      #
+# (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -8,9 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-################################################################################
-# Package: Particle2MCTruth
-################################################################################
 gaudi_subdir(Particle2MCTruth)
 
 gaudi_depends_on_subdirs(Phys/DaVinciMCKernel
@@ -37,6 +34,4 @@ gaudi_add_dictionary(P2MCP
                      dict/Particle2MCTruthDict.h
                      dict/Particle2MCTruthDict.xml
                      INCLUDE_DIRS CLHEP
-                     LINK_LIBRARIES CLHEP DaVinciMCKernelLib LoKiAlgoMCLib Particle2MCTruthLib
-                     OPTIONS "-U__MINGW32__")
-
+                     LINK_LIBRARIES CLHEP DaVinciMCKernelLib LoKiAlgoMCLib Particle2MCTruthLib)