Skip to content

Commit e19cf81

Browse files
authored
fix: use GNUInstallDirs for installation locations (#72)
1 parent ce40c2e commit e19cf81

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cpp/CMakeLists.txt

+15-9
Original file line numberDiff line numberDiff line change
@@ -106,24 +106,30 @@ target_include_directories(
106106
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
107107
$<INSTALL_INTERFACE:include/resolvo>)
108108

109+
include(GNUInstallDirs)
110+
109111
export(
110112
TARGETS Resolvo resolvo_cpp
111113
NAMESPACE Resolvo::
112114
FILE "${CMAKE_BINARY_DIR}/lib/cmake/Resolvo/ResolvoTargets.cmake")
113115
install(
114116
EXPORT ResolvoTargets
115117
NAMESPACE Resolvo::
116-
DESTINATION lib/cmake/Resolvo)
118+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Resolvo)
119+
117120
install(
118121
TARGETS Resolvo resolvo_cpp
119122
EXPORT ResolvoTargets
120-
LIBRARY DESTINATION lib
121-
PUBLIC_HEADER DESTINATION include/resolvo)
122-
123-
install(FILES $<TARGET_FILE:${resolvo_cpp_impl}> TYPE LIB)
123+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
124+
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/resolvo)
124125

125-
if(WIN32)
126-
install(FILES $<TARGET_LINKER_FILE:${resolvo_cpp_impl}> TYPE LIB)
126+
if(BUILD_SHARED_LIBS)
127+
install(FILES $<TARGET_FILE:${resolvo_cpp_impl}> TYPE BIN)
128+
if(WIN32)
129+
install(FILES $<TARGET_LINKER_FILE:${resolvo_cpp_impl}> TYPE LIB)
130+
endif()
131+
else()
132+
install(FILES $<TARGET_FILE:${resolvo_cpp_impl}> TYPE LIB)
127133
endif()
128134

129135
include(CMakePackageConfigHelpers)
@@ -160,7 +166,7 @@ function(_resolvo_write_configure_file)
160166
configure_package_config_file(
161167
"cmake/ResolvoConfig.cmake.in"
162168
"${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Resolvo/ResolvoConfig.cmake"
163-
INSTALL_DESTINATION lib/cmake/resolvo)
169+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Resolvo)
164170
endfunction()
165171

166172
cmake_language(DEFER CALL _resolvo_write_configure_file)
@@ -175,7 +181,7 @@ install(
175181
FILES
176182
"${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Resolvo/ResolvoConfig.cmake"
177183
"${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Resolvo/ResolvoConfigVersion.cmake"
178-
DESTINATION lib/cmake/Resolvo)
184+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Resolvo)
179185

180186
if(RESOLVO_BUILD_TESTING)
181187
add_subdirectory(tests)

cpp/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "resolvo_cpp"
33
description = "Resolvo C++ integration"
4-
version = "0.2.0"
4+
version = "0.2.1"
55
authors.workspace = true
66
keywords.workspace = true
77
categories.workspace = true

0 commit comments

Comments
 (0)