@@ -106,24 +106,30 @@ target_include_directories(
106
106
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /include >
107
107
$<INSTALL_INTERFACE:include /resolvo>)
108
108
109
+ include (GNUInstallDirs)
110
+
109
111
export (
110
112
TARGETS Resolvo resolvo_cpp
111
113
NAMESPACE Resolvo::
112
114
FILE "${CMAKE_BINARY_DIR} /lib/cmake/Resolvo/ResolvoTargets.cmake" )
113
115
install (
114
116
EXPORT ResolvoTargets
115
117
NAMESPACE Resolvo::
116
- DESTINATION lib/cmake/Resolvo)
118
+ DESTINATION ${CMAKE_INSTALL_LIBDIR} /cmake/Resolvo)
119
+
117
120
install (
118
121
TARGETS Resolvo resolvo_cpp
119
122
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)
124
125
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)
127
133
endif ()
128
134
129
135
include (CMakePackageConfigHelpers)
@@ -160,7 +166,7 @@ function(_resolvo_write_configure_file)
160
166
configure_package_config_file(
161
167
"cmake/ResolvoConfig.cmake.in"
162
168
"${CMAKE_CURRENT_BINARY_DIR} /lib/cmake/Resolvo/ResolvoConfig.cmake"
163
- INSTALL_DESTINATION lib /cmake/resolvo )
169
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR} /cmake/Resolvo )
164
170
endfunction ()
165
171
166
172
cmake_language(DEFER CALL _resolvo_write_configure_file)
@@ -175,7 +181,7 @@ install(
175
181
FILES
176
182
"${CMAKE_CURRENT_BINARY_DIR} /lib/cmake/Resolvo/ResolvoConfig.cmake"
177
183
"${CMAKE_CURRENT_BINARY_DIR} /lib/cmake/Resolvo/ResolvoConfigVersion.cmake"
178
- DESTINATION lib /cmake/Resolvo)
184
+ DESTINATION ${CMAKE_INSTALL_LIBDIR} /cmake/Resolvo)
179
185
180
186
if (RESOLVO_BUILD_TESTING)
181
187
add_subdirectory (tests)
0 commit comments