Skip to content

Commit

Permalink
CI: macOS build
Browse files Browse the repository at this point in the history
attempt to fix macOS CI blindly, i don't really care if it is
actually working on a real macOS device...
  • Loading branch information
BLumia committed May 18, 2024
1 parent 2baa7e7 commit 3656797
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 99 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,21 @@ jobs:
with:
version: '6.7.0'
modules: 'qtmultimedia'
- name: Install Conan
id: conan
working-directory: ./
shell: bash
run: |
pip3 install wheel setuptools
pip3 install conan --upgrade
conan --version
conan profile detect
- name: Build
working-directory: ./
run: |
cmake -B build .
cmake --build build -j
conan install --requires=icu/74.2 --generator CMakeDeps --generator CMakeToolchain --build=missing
cmake . --preset conan-release
cmake --build --preset conan-release
- name: Package
id: package
working-directory: ./
Expand Down
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SET(CMAKE_EXTRA_INCLUDE_FILES)

add_compile_definitions(PATH_VALSIZE=${PATH_VALSIZE})

add_executable(thplayer
add_executable(thplayer WIN32 MACOSX_BUNDLE
main.cpp
loopedpcmstreamer.cpp loopedpcmstreamer.hpp
mainwindow.cpp mainwindow.hpp
Expand Down Expand Up @@ -61,6 +61,3 @@ target_include_directories(thplayer PRIVATE ${thtk_bindir})

target_link_libraries(thplayer thtk Qt6::Widgets Qt6::Multimedia ICU::uc ICU::i18n)

if(WIN32)
set_property(TARGET thplayer PROPERTY WIN32_EXECUTABLE True)
endif()
93 changes: 0 additions & 93 deletions thplayer.pro

This file was deleted.

0 comments on commit 3656797

Please sign in to comment.