diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 6ee6d6b43..1db23c823 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -260,6 +260,7 @@ jobs: -D DEV_BRANCH=${{ matrix.build.dev-build }} -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} -D VNC=OFF + -D QT=OFF -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} -D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11 - name: Build @@ -316,7 +317,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install dependencies - run: brew install freetype sdl2 libpng openal-soft rtmidi + run: brew install freetype sdl2 libpng openal-soft rtmidi qt@5 - name: Configure CMake run: >- cmake -S . -B build @@ -325,6 +326,9 @@ jobs: -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} -D VNC=OFF -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} + -D QT=ON + -D Qt5_DIR=/usr/local/Cellar/qt@5/5.15.2/lib/cmake/ + -D Qt5LinguistTools_DIR=/usr/local/Cellar/qt@5/5.15.2/lib/cmake/Qt5LinguistTools/ - name: Build run: cmake --build build - name: Generate package diff --git a/CMakeLists.txt b/CMakeLists.txt index e1f6fc47e..9170741cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,11 @@ option(CPPTHREADS "C++11 threads" option(NEW_DYNAREC "Use the PCem v15 (\"new\") dynamic recompiler" OFF) option(MINITRACE "Enable Chrome tracing using the modified minitrace library" OFF) option(DEV_BRANCH "Development branch" OFF) +if(NOT WIN32) +option(QT "QT GUI" ON) +else() option(QT "QT GUI" OFF) +endif() # Development branch features #