More setup for C++ tool building