Skip to content

Commit 5e4731a

Browse files
committed
Try to fix cppcmake.yml for Win x32
1 parent e7a0562 commit 5e4731a

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/cppcmake.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,12 @@ jobs:
7474
- name: test install using examples
7575
run: |
7676
# Test that the in-tree install was successful by building the examples
77-
cmake -S examples -B examples/build -DLSL_INSTALL_ROOT=${PWD}/install -DCMAKE_INSTALL_PREFIX=examples/build/install -DLSL_COMFY_DEFAULTS=ON
77+
cmake -S examples -B examples/build \
78+
-DLSL_INSTALL_ROOT=${PWD}/install \
79+
-DCMAKE_INSTALL_PREFIX=examples/build/install \
80+
-DLSL_COMFY_DEFAULTS=ON \
81+
${{ matrix.config.cmake_extra }} \
82+
${{ github.event.inputs.cmakeextra }}
7883
cmake --build examples/build --target install --config Release -j
7984
./examples/build/install/bin/HandleMetaData
8085

examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,5 @@ if(WIN32)
9393
install(
9494
CODE "file(INSTALL DESTINATION \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}\" TYPE SHARED_LIBRARY FILES \"$<TARGET_FILE:LSL::lsl>\")"
9595
COMPONENT ${PROJECT_NAME}
96-
)#install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different \"$<TARGET_FILE:LSL::lsl>\" \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}\")")
96+
)
9797
endif()

0 commit comments

Comments
 (0)