Fix cmake files
Merge pull request #27 from ComputationalRadiationPhysics/fix_cmake

Fix cmake files