fix CMakeLists.txt
Merge branch 'master' into jit