Modified CMakeList.txt file for Kevin

Modified CMakeList.txt file for Kevin
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tests/DemoTestStatic/CMakeLists.txt