Skip to content

Commit 3973449

Browse files
authored
Fix CMake export files (#484)
Fixes: #482, #483
1 parent 2b70208 commit 3973449

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ endfunction()
7171

7272
# The library
7373

74+
if(HIDAPI_INSTALL_TARGETS)
75+
include(GNUInstallDirs)
76+
endif()
77+
7478
add_library(hidapi_include INTERFACE)
7579
target_include_directories(hidapi_include INTERFACE
7680
"$<BUILD_INTERFACE:${PROJECT_ROOT}/hidapi>"
@@ -82,7 +86,6 @@ set(HIDAPI_PUBLIC_HEADERS "${PROJECT_ROOT}/hidapi/hidapi.h")
8286
add_library(hidapi::include ALIAS hidapi_include)
8387

8488
if(HIDAPI_INSTALL_TARGETS)
85-
include(GNUInstallDirs)
8689
install(TARGETS hidapi_include EXPORT hidapi)
8790
endif()
8891

@@ -160,7 +163,7 @@ if(HIDAPI_INSTALL_TARGETS)
160163
include(CMakePackageConfigHelpers)
161164
set(EXPORT_DENERATED_LOCATION "${CMAKE_BINARY_DIR}/export_generated")
162165
set(EXPORT_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/hidapi")
163-
write_basic_package_version_file("${EXPORT_DENERATED_LOCATION}/libhidapi-version.cmake"
166+
write_basic_package_version_file("${EXPORT_DENERATED_LOCATION}/hidapi-config-version.cmake"
164167
COMPATIBILITY SameMajorVersion
165168
)
166169
configure_package_config_file("cmake/hidapi-config.cmake.in" "${EXPORT_DENERATED_LOCATION}/hidapi-config.cmake"
@@ -174,7 +177,7 @@ if(HIDAPI_INSTALL_TARGETS)
174177
FILE "libhidapi.cmake"
175178
)
176179
install(FILES
177-
"${EXPORT_DENERATED_LOCATION}/libhidapi-version.cmake"
180+
"${EXPORT_DENERATED_LOCATION}/hidapi-config-version.cmake"
178181
"${EXPORT_DENERATED_LOCATION}/hidapi-config.cmake"
179182
DESTINATION "${EXPORT_DESTINATION}"
180183
)

0 commit comments

Comments
 (0)