Fixed rebasing error, fixed indentation, looking for pthread on non windows systems
Fixed rebasing error, fixed indentation, looking for pthread on non windows systems

ament/ament_cmake,ament/ament_cmake,firesurfer/ament_cmake,ament/ament_cmake,firesurfer/ament_cmake