Fix for merge build error.  Attempt to cleanup cmake warnings regarding incorrect target_link_libraries