CMakeLists changes, linking errors still