Merge branch 'actions'
This commit is contained in:
commit
5092539b8c
|
@ -6,6 +6,8 @@ jobs:
|
||||||
Build:
|
Build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: ischanx/checkout@8c80eac3058d03dc5301629e8f7d59ae255d6cc3
|
||||||
- name: Install dependancies
|
- name: Install dependancies
|
||||||
run: |
|
run: |
|
||||||
apt update
|
apt update
|
||||||
|
@ -14,8 +16,6 @@ jobs:
|
||||||
wget https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.7z
|
wget https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.7z
|
||||||
mkdir libusb
|
mkdir libusb
|
||||||
7z x libusb-1.0.29.7z -olibusb
|
7z x libusb-1.0.29.7z -olibusb
|
||||||
- name: Check out repository code
|
|
||||||
uses: ischanx/checkout@8c80eac3058d03dc5301629e8f7d59ae255d6cc3
|
|
||||||
- name: Version
|
- name: Version
|
||||||
id: version
|
id: version
|
||||||
run: git fetch -a; echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT
|
run: git fetch -a; echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT
|
||||||
|
|
|
@ -57,6 +57,9 @@ endif(WIN32)
|
||||||
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
|
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
|
||||||
target_include_directories(${PROJECT_NAME} PUBLIC ${LIBUSB_INCLUDE_DIRS})
|
target_include_directories(${PROJECT_NAME} PUBLIC ${LIBUSB_INCLUDE_DIRS})
|
||||||
target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARIES})
|
target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARIES})
|
||||||
|
if(WIN32)
|
||||||
|
target_link_libraries(${PROJECT_NAME} libpthread.a)
|
||||||
|
endif(WIN32)
|
||||||
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -O2 -fno-strict-aliasing)
|
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -O2 -fno-strict-aliasing)
|
||||||
install(TARGETS ${PROJECT_NAME} DESTINATION lib)
|
install(TARGETS ${PROJECT_NAME} DESTINATION lib)
|
||||||
install(FILES ./eismultiplexer.h DESTINATION include)
|
install(FILES ./eismultiplexer.h DESTINATION include)
|
||||||
|
@ -64,6 +67,9 @@ install(FILES ./eismultiplexer.h DESTINATION include)
|
||||||
add_library(${PROJECT_NAME}_static STATIC ${SRC_FILES})
|
add_library(${PROJECT_NAME}_static STATIC ${SRC_FILES})
|
||||||
target_include_directories(${PROJECT_NAME}_static PUBLIC ${LIBUSB_INCLUDE_DIRS})
|
target_include_directories(${PROJECT_NAME}_static PUBLIC ${LIBUSB_INCLUDE_DIRS})
|
||||||
target_link_libraries(${PROJECT_NAME}_static ${LIBUSB_LIBRARIES})
|
target_link_libraries(${PROJECT_NAME}_static ${LIBUSB_LIBRARIES})
|
||||||
|
if(WIN32)
|
||||||
|
target_link_libraries(${PROJECT_NAME}_static libpthread.a)
|
||||||
|
endif(WIN32)
|
||||||
target_compile_options(${PROJECT_NAME}_static PRIVATE -Wall -O2 -fno-strict-aliasing)
|
target_compile_options(${PROJECT_NAME}_static PRIVATE -Wall -O2 -fno-strict-aliasing)
|
||||||
install(TARGETS ${PROJECT_NAME}_static DESTINATION lib)
|
install(TARGETS ${PROJECT_NAME}_static DESTINATION lib)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue