Cleanup of CMake winscard support
Addressed issues created by linux build updates