[CMake] Hhopefully fix libmpq compilation on ubuntu and make it use cmak...

...e more properly than before

Would be nice with a test to see if this helps ubuntu compilation. Thanks