Skip to content

Commit

Permalink
wip: trying to fix github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
klonyyy committed Apr 19, 2024
1 parent bec2eb4 commit f381cdc
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,5 @@ test/STMViewer_test/.settings/
*.lib

# Executables
*.exe
*.out
*.app
14 changes: 12 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,16 @@ if(WIN32)
COMMAND ${CMAKE_COMMAND} -E copy
${LIBUSB_WINDOWS}
${CMAKE_BINARY_DIR}/libusb-1.0.dll)

add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
${GDB_WINDOWS}
${CMAKE_BINARY_DIR}/gdb.exe)

add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
${JLINK_WINDOWS}
${CMAKE_BINARY_DIR})
endif()

add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
Expand All @@ -225,7 +235,7 @@ if(WIN32)
set_target_properties(${EXECUTABLE} PROPERTIES WIN32_EXECUTABLE TRUE)
endif()

install(FILES ${LIBUSB_WINDOWS} ${STLINK_WINDOWS} ${GLFW3_WINDOWS} ${GDB_WINDOWS} DESTINATION ${INSTALL_PATH})
install(FILES ${LIBUSB_WINDOWS} ${STLINK_WINDOWS} ${GLFW3_WINDOWS} ${GDB_WINDOWS} ${JLINK_WINDOWS} DESTINATION ${INSTALL_PATH})
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
SetOutPath \\\"$INSTDIR\\\\bin\\\"
CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${EXECUTABLE}.lnk\\\" \\\"$INSTDIR\\\\bin\\\\${EXECUTABLE}.exe\\\"
Expand All @@ -236,7 +246,7 @@ if(WIN32)
endif()

if(UNIX)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/launch/icon.png DESTINATION ${INSTALL_PATH})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/launch/icon.png ${JLINK_LINUX} DESTINATION ${INSTALL_PATH})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/launch/STMViewer.desktop
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
DESTINATION ${DESKTOP_FILE_PATH})
Expand Down
Binary file added third_party/GDB/windows/gdb.exe
Binary file not shown.
Binary file removed third_party/spdlog/lib/linux/libspdlog.so.1.11.0
Binary file not shown.

0 comments on commit f381cdc

Please sign in to comment.