Updated pc CMakeLists
Merge branch 'refactor'