diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d120dba3f3e58562ac030b945bf73f3552ad1b0..3378c5d45a162c3dc5b461d0b7a34a0193a0a9ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,12 +61,12 @@ add_subdirectory(doc)
 add_library(caosdb STATIC ${libcaosdb_INCL} ${libcaosdb_SRC})
 set_target_properties(caosdb PROPERTIES
     CXX_CLANG_TIDY "${_CMAKE_CXX_CLANG_TIDY}"
-    CXX_INCLUDE_WHAT_YOU_USE "${_CMAKE_CXX_CLANG_TIDY}"
+    CXX_INCLUDE_WHAT_YOU_USE "${_CMAKE_CXX_INCLUDE_WHAT_YOU_USE}"
     )
 add_executable(caosdbcli src/caosdbcli.cpp)
 set_target_properties(caosdbcli PROPERTIES
     CXX_CLANG_TIDY "${_CMAKE_CXX_CLANG_TIDY}"
-    CXX_INCLUDE_WHAT_YOU_USE "${_CMAKE_CXX_CLANG_TIDY}"
+    CXX_INCLUDE_WHAT_YOU_USE "${_CMAKE_CXX_INCLUDE_WHAT_YOU_USE}"
     )
 target_link_libraries(caosdbcli caosdb)
 
@@ -143,6 +143,7 @@ ${_PROTOBUF_LIBPROTOBUF})
 
 # These variables slightly modify the install location to allow for version
 # specific installations.
+option(INSTALL_DIR_NAME "libcaosdb-${libcaosdb_VERSION}")
 set(libcaosdb_INCLUDE_DEST "include/libcaosdb-${libcaosdb_VERSION}")
 set(libcaosdb_LIB_DEST "lib/libcaosdb-${libcaosdb_VERSION}")