Some modifications in CMakeList.txt