fix a few issues regarding cmake refactoring

created branch 19-fix-a-few-issues-regarding-cmake-refactoring to address this issue

mentioned in merge request !24 (merged)

mentioned in commit abff3e7e

closed with merge request !24 (merged)