WIP: Minor configuration changes to support new Gaudi CMake configuration
the changes here are backward compatible, but required when using new Gaudi new CMake configuration
the changes here are backward compatible, but required when using new Gaudi new CMake configuration