diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff65f14..8f0238e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,9 @@ include(version.cmake)
 project(safestring
   VERSION ${SAFEC_VERSION_STRING}
   DESCRIPTION "Safe C string library"
+  LANGUAGES C
 )
+include(GNUInstallDirs)
 
 option(BUILD_UNITTESTS "Build also project unit-tests" OFF)
 
@@ -191,7 +193,7 @@ add_library(${PROJECT_NAME}_static STATIC $<TARGET_OBJECTS:${PROJECT_NAME}_objli
 
 target_include_directories(${PROJECT_NAME}_shared PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<INSTALL_INTERFACE:include>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 target_include_directories(${PROJECT_NAME}_static PUBLIC include)
 
@@ -221,7 +223,7 @@ install(TARGETS ${PROJECT_NAME}_shared EXPORT ${PROJECT_NAME}Config
   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 
-install(EXPORT ${PROJECT_NAME}Config DESTINATION share/${PROJECT_NAME}/cmake)
+install(EXPORT ${PROJECT_NAME}Config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
 export(TARGETS ${PROJECT_NAME}_shared FILE ${PROJECT_NAME}Config.cmake)
 
@@ -237,5 +239,4 @@ set(CPACK_DEBIAN_PACKAGE_NAME "lib${PROJECT_NAME}")
 set(CPACK_DISPLAY_NAME "lib${PROJECT_NAME} run-time library")
 set(CPACK_PACKAGE_NAME "lib${PROJECT_NAME}")
 set(CPACK_DESCRIPTION "Safe String library and header files.")
-include(GNUInstallDirs)
 include(CPack)
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 1326641..d7ab61b 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: MIT
 # Copyright (C) 2019 Intel Corporation
 cmake_minimum_required(VERSION 3.1)
-project(safestring_test)
+project(safestring_test
+  LANGUAGES C)
 
 set(SOURCES
   Safe_String_UnitTestMain.c