Skip to content

Commit 5daa67b

Browse files
committed
safestringlib: cmake:
install the Config.cmake file into the libdir folder Signed-off-by: yoong jin <[email protected]>
1 parent fd159bf commit 5daa67b

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Diff for: CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ include(version.cmake)
77
project(safestring
88
VERSION ${SAFEC_VERSION_STRING}
99
DESCRIPTION "Safe C string library"
10+
LANGUAGES C
1011
)
12+
include(GNUInstallDirs)
1113

1214
option(BUILD_UNITTESTS "Build also project unit-tests" OFF)
1315

@@ -191,7 +193,7 @@ add_library(${PROJECT_NAME}_static STATIC $<TARGET_OBJECTS:${PROJECT_NAME}_objli
191193

192194
target_include_directories(${PROJECT_NAME}_shared PUBLIC
193195
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
194-
$<INSTALL_INTERFACE:include>
196+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
195197
)
196198
target_include_directories(${PROJECT_NAME}_static PUBLIC include)
197199

@@ -221,7 +223,7 @@ install(TARGETS ${PROJECT_NAME}_shared EXPORT ${PROJECT_NAME}Config
221223
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
222224
)
223225

224-
install(EXPORT ${PROJECT_NAME}Config DESTINATION share/${PROJECT_NAME}/cmake)
226+
install(EXPORT ${PROJECT_NAME}Config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
225227

226228
export(TARGETS ${PROJECT_NAME}_shared FILE ${PROJECT_NAME}Config.cmake)
227229

@@ -237,5 +239,4 @@ set(CPACK_DEBIAN_PACKAGE_NAME "lib${PROJECT_NAME}")
237239
set(CPACK_DISPLAY_NAME "lib${PROJECT_NAME} run-time library")
238240
set(CPACK_PACKAGE_NAME "lib${PROJECT_NAME}")
239241
set(CPACK_DESCRIPTION "Safe String library and header files.")
240-
include(GNUInstallDirs)
241242
include(CPack)

Diff for: unittests/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# SPDX-License-Identifier: MIT
22
# Copyright (C) 2019 Intel Corporation
33
cmake_minimum_required(VERSION 3.1)
4-
project(safestring_test)
4+
project(safestring_test
5+
LANGUAGES C)
56

67
set(SOURCES
78
Safe_String_UnitTestMain.c

0 commit comments

Comments
 (0)