Made consistent with hesaff cmakelists
merged conflicts and moved fopenmp flag to openmp if statement