COMP: rearrange CMakeLists.txt to accomodate CMake 3