Comming cmake changes
C
C
C
Fixed CMakeLists for Linux builds.erge branch 'cmake'