fixed CMakeLists.txt for BGQ with GNU
two patches for armadillo to get it to compile statically on BGQ