Trying to fix windows

This commit is contained in:
Shaun Reed 2023-01-21 08:01:13 -05:00
parent 48719412f2
commit 4c4f263131
4 changed files with 30 additions and 6 deletions

View File

@ -35,6 +35,14 @@ jobs:
args: install pkgconfiglite --checksum e87b5ea3c9142256af60f2d5b917aa63b571e6a0 --checksum-type sha1
- name: Build Qtk
if: matrix.os == 'windows-latest'
shell: bash
run: |
cmake -B build/ ${{ matrix.cmake }} -DQTK_UPDATE_SUBMODULES=ON
cmake --build build/
- name: Build Qtk
if: matrix.os != 'windows-latest'
shell: bash
run: |
cmake -B build/ ${{ matrix.cmake }} -DQTK_UPDATE_SUBMODULES=ON
@ -52,6 +60,14 @@ jobs:
path: install/*
- name: Package Qtk
if: matrix.os == 'windows-latest'
shell: bash
run: |
cd build/
cmake --build . --target package
- name: Package Qtk
if: matrix.os != 'windows-latest'
shell: bash
run: |
cd build/
@ -104,6 +120,13 @@ jobs:
sudo apt install libassimp-dev
- name: Build Qtk
if: matrix.os == 'windows-latest'
shell: bash
run: |
cmake -B build/ ${{ matrix.cmake }} && cmake --build build/
- name: Build Qtk
if: matrix.os != 'windows-latest'
shell: bash
run: |
cmake -B build/ ${{ matrix.cmake }} && cmake --build build/ -- -j $(nproc)

View File

@ -25,7 +25,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
#set(CMAKE_MACOSX_BUNDLE ON)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
if(MSVC)
if(WIN32)
set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
add_compile_options(-warnnotaserror)
add_compile_options(/wd4131 /wd4127)
@ -116,12 +116,13 @@ if(NOT Qt6_FOUND)
endif()
# Find Assimp
set(ASSIMP_BUILD_TESTS OFF)
set(ASSIMP_BUILD_TESTS OFF CACHE STRING "Do not build assimp tests." FORCE)
if(QTK_UPDATE_SUBMODULES)
message(STATUS "[Qtk] Updating submodules...")
set(ASSIMP_INSTALL OFF)
set(ASSIMP_INSTALL OFF CACHE STRING "Use assimp as a submodule." FORCE)
set(ASSIMP_WARNINGS_AS_ERRORS OFF CACHE STRING "No warnings as errors." FORCE)
submodule_update("${CMAKE_CURRENT_SOURCE_DIR}/extern/assimp/assimp/")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/extern/assimp/assimp/")
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/extern/assimp/assimp/" EXCLUDE_FROM_ALL)
else()
find_package(assimp REQUIRED)
endif()

View File

@ -18,7 +18,7 @@ namespace Ui {
}
namespace Qtk {
class QDESIGNER_WIDGET_EXPORT ToolBox : public QDockWidget {
class ToolBox : public QDockWidget {
Q_OBJECT
public:

View File

@ -22,7 +22,7 @@ namespace Ui {
}
namespace Qtk {
class QDESIGNER_WIDGET_EXPORT TreeView : public QDockWidget {
class TreeView : public QDockWidget {
Q_OBJECT
public: