Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1733 Auto Qt #1772

Merged
merged 11 commits into from
Feb 11, 2024
Merged

1733 Auto Qt #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
252b5d6
Qt calls in root CMakeLists.txt.
trisyoungs Jan 19, 2024
2b78963
Reorganise main gui CMakeLists.txt and remove first hui file.
trisyoungs Jan 22, 2024
99bdbee
Rename more hui files.
trisyoungs Jan 22, 2024
5b2e6bb
Fix location of generated files from different dir.
trisyoungs Jan 22, 2024
62345bf
Rename ui-related cpp files.
trisyoungs Jan 22, 2024
55b2eed
Delegates dir.
trisyoungs Jan 22, 2024
dfca913
KeywordWidgets dir.
trisyoungs Jan 22, 2024
2c23877
Widgets dir and more tidy up.
trisyoungs Jan 22, 2024
511bb04
Formatting (mostly header ordering).
trisyoungs Jan 22, 2024
166dfc4
Update module CMakeLists.txt.
trisyoungs Jan 22, 2024
079f5e9
Link more libs to gui unit tests.
trisyoungs Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,13 @@ if(GUI)
endif()
add_definitions(-DQT_NO_KEYWORDS)

# Make sure CMake won't try to generate rules for moc (we will do it ourselves)
# Make sure we enable automated handling of Qt files
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)

# Set policy for automatic linkage of Qt libs to project
cmake_policy(SET CMP0020 NEW)
# Disable Qt macros
add_definitions(-DQT_NO_KEYWORDS)
endif(GUI)

# Perform system-specific setup -- Windows
Expand Down Expand Up @@ -227,6 +229,7 @@ if(GUI)
${gui_target_name}
PRIVATE ${PROJECT_SOURCE_DIR}/src
${PROJECT_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/src/gui/gui_autogen/include
${FREETYPE_INCLUDE_DIRS}
${Qt6Core_INCLUDE_DIRS}
${Qt6Gui_INCLUDE_DIRS}
Expand Down
Loading
Loading