Skip to content

Commit

Permalink
fix: cmake compilation issues
Browse files Browse the repository at this point in the history
  • Loading branch information
ABeltramo committed Feb 15, 2024
1 parent f3c5d27 commit 322d2ea
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_EXTENSIONS=OFF \
-DCMAKE_CXX_STANDARD=17 \
-DTEST_UINPUT=OFF \
-DTEST_VIRTUAL_INPUT=OFF \
-DTEST_LIBINPUT=OFF \
-DTEST_DOCKER=ON \
-DLINK_RUST_WAYLAND=ON \
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
-DCMAKE_CXX_EXTENSIONS=OFF \
-DBUILD_SHARED_LIBS=${{ matrix.shared }} \
-DCATCH_DEVELOPMENT_BUILD=ON \
-DTEST_UINPUT=OFF \
-DTEST_VIRTUAL_INPUT=OFF \
-DTEST_LIBINPUT=OFF \
-DTEST_DOCKER=OFF \
-DLINK_RUST_WAYLAND=ON \
Expand Down
2 changes: 1 addition & 1 deletion src/core/src/platforms/linux/uinput/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (UNIX AND NOT APPLE)
pkg_check_modules(LIBUDEV REQUIRED IMPORTED_TARGET libudev)
target_link_libraries(wolf_uinput PUBLIC PkgConfig::LIBUDEV)
target_sources(wolf_uinput
PUBLIC "keyboard.hpp" "uinput.hpp"
PUBLIC "uinput.hpp"
PRIVATE ${PRIVATE_LIST})
endif ()

Expand Down
5 changes: 2 additions & 3 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ if (UNIX AND NOT APPLE)
list(APPEND SRC_LIST "platforms/linux/nvidia.cpp")
endif ()

option(TEST_LIBINPUT "Enable libinput test" ON)
if (TEST_LIBINPUT)
option(TEST_VIRTUAL_INPUT "Enable libinput test" ON)
if (TEST_VIRTUAL_INPUT)
find_package(PkgConfig)
pkg_check_modules(LIBINPUT REQUIRED IMPORTED_TARGET libinput)
target_link_libraries(wolftests PRIVATE PkgConfig::LIBINPUT)
Expand All @@ -41,7 +41,6 @@ if (UNIX AND NOT APPLE)
endif ()
list(APPEND SRC_LIST
"platforms/linux/libinput.h"
"platforms/linux/testLibinput.cpp"
"platforms/linux/input.cpp")
endif ()
endif ()
Expand Down
Empty file added tests/testJoypads.cpp
Empty file.

0 comments on commit 322d2ea

Please sign in to comment.