Recommited changes for previous commit on ce_base/CMakeLists.txt