debug

Author: Youw

.github/workflows/builds.yml

@@ -45,20 +45,6 @@ jobs:
         fail: true
     - name: Check CMake Export Package Shared
       run: |
-        cmake --version
-        ls -la install/shared-cmake/lib/cmake/hidapi/
-        sed -i '1s/^/message("! PACKAGE_FIND_VERSION: ${PACKAGE_FIND_VERSION}")\n/' install/shared-cmake/lib/cmake/hidapi/hidapi-config-version.cmake
-        sed -i '1s/^/message("! CVF_VERSION: ${CVF_VERSION}")\n/' install/shared-cmake/lib/cmake/hidapi/hidapi-config-version.cmake
-        sed -i '1s/^/message("! CMAKE_SIZEOF_VOID_P: ${CMAKE_SIZEOF_VOID_P}")\n/' install/shared-cmake/lib/cmake/hidapi/hidapi-config-version.cmake
-        
-        cat install/shared-cmake/lib/cmake/hidapi/hidapi-config.cmake
-        echo "------------- --------------------- ----------------------- ----------------------"
-        echo "------------- --------------------- ----------------------- ----------------------"
-        echo "------------- --------------------- ----------------------- ----------------------"
-        cat install/shared-cmake/lib/cmake/hidapi/hidapi-config-version.cmake
-        echo "------------- --------------------- ----------------------- ----------------------"
-        echo "------------- --------------------- ----------------------- ----------------------"
-        echo "------------- --------------------- ----------------------- ----------------------"
         cmake \
           -B build/shared_test \
           -S hidapisrc/hidtest \
@@ -73,7 +59,7 @@ jobs:
         cmake \
           -B build/static_test \
           -S hidapisrc/hidtest \
-          -Dhidapi_ROOT=install/static-cmake \
+          -Dhidapi_ROOT=$(pwd)/install/static-cmake \
           -DCMAKE_INSTALL_PREFIX=install/static_test \
           "-DCMAKE_C_FLAGS=${GNU_COMPILE_FLAGS}"
         cd build/static_test

hidtest/CMakeLists.txt

@@ -9,17 +9,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
         cmake_policy(SET CMP0074 NEW)
     endif()
 
-    set(CMAKE_FIND_DEBUG_MODE ON)
-    find_package(hidapi 0.12)
-    unset(CMAKE_FIND_DEBUG_MODE)
-
-    message("!!! hidapi_VERSION: ${hidapi_VERSION}")
-    message("!!! hidapi_VERSION_EXACT: ${hidapi_VERSION_EXACT}")
-    message("!!! hidapi_COMPONENTS: ${hidapi_COMPONENTS}")
-    message("!!! hidapi_FIND_COMPONENTS: ${hidapi_FIND_COMPONENTS}")
-    if(NOT hidapi_FOUND)
-        return()
-    endif()
+    find_package(hidapi 0.12 REQUIRED)
     message(STATUS "Using HIDAPI: ${hidapi_VERSION}")
 else()
     # hidtest is built as part of the main HIDAPI build

src/cmake/hidapi-config.cmake.in

@@ -9,7 +9,7 @@ set(hidapi_VERSION "@hidapi_VERSION@")
 set(PACKAGE_VERSION "${hidapi_VERSION}")
 set(hidapi_VERSION_STR "@hidapi_VERSION@@VERSION_SUFFIX@")
 
-message(FATAL_ERROR "!! hidapi_VERSION: ${hidapi_VERSION}")
+message("!! hidapi_VERSION: ${hidapi_VERSION}")
 
 set(hidapi_FOUND FALSE)