Skip to content

Commit

Permalink
CI tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
folkertvanheusden committed Oct 15, 2024
1 parent 1c3ba79 commit d97bad5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: cmake
run: cmake -B build
run: cmake -B build -DIS_MAC=TRUE
- name: make
run: make -C build
4 changes: 4 additions & 0 deletions .github/workflows/posix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Install lcov
run: |
sudo apt-get update
sudo apt-get -y install libiscsi-dev
- name: cmake
run: cmake -B build
- name: make
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ target_link_libraries(iesp Threads::Threads)

include(FindPkgConfig)

if (NOT IS_WINDOWS)
if ((NOT IS_WINDOWS) AND (NOT IS_MAC))
add_executable(
quick-test
quick-test.cpp
Expand All @@ -53,7 +53,7 @@ target_link_libraries(quick-test ${LIBISCSI_LIBRARIES})
target_include_directories(quick-test PUBLIC ${LIBISCSI_INCLUDE_DIRS})
target_compile_options(quick-test PUBLIC ${LIBISCSI_CFLAGS_OTHER})

endif (NOT IS_WINDOWS)
endif ((NOT IS_WINDOWS) AND (NOT IS_MAC))

set(CMAKE_BUILD_TYPE RelWithDebInfo)
#set(CMAKE_BUILD_TYPE Debug)
Expand Down
2 changes: 2 additions & 0 deletions mingw64-github-ci.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
set(CMAKE_SYSTEM_NAME Windows)

set(IS_WINDOWS TRUE)

add_compile_options(-mno-ms-bitfields -D_FILE_OFFSET_BITS=64)
link_libraries(ws2_32)
set(CMAKE_EXE_LINKER_FLAGS "-lws2_32 -static -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -lwinpthread -Wl,-Bdynamic")

0 comments on commit d97bad5

Please sign in to comment.