Skip to content

Framework alias headers #189

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

Draft
sithlord48 wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Framework alias headers #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6eaae3
fix: ChararacterEditor not emitting limit2Changed
sithlord48 Feb 17, 2025
5db1e61
build: update alias headers to install with the public headers
sithlord48 Mar 1, 2025
6ccbe95
ci: build framework for macos
sithlord48 Mar 1, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
name: "MacOS"
, os: macos-latest
, QT_INST_DIR: /Users/runner, Qt_TOOL_PATH: "/Users/runner/Qt/Tools/QtInstallerFramework/4.6"
, extraCmakeConfig: "-DCMAKE_OSX_ARCHITECTURES=\"arm64;x86_64\""
, extraCmakeConfig: "-DCMAKE_OSX_ARCHITECTURES=\"arm64;x86_64\" -DFRAMEWORKS=ON"
}
- {
name: "Windows-x64"
Expand Down
6 changes: 2 additions & 4 deletions cmake/ff7tkMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ macro(MAKE_LIBRARY LIB_TARGET HEADER_INSTALL_DIR)
list(APPEND ALIASHEADERS ${CMAKE_CURRENT_BINARY_DIR}/${HEADER})
endforeach()

list(APPEND ${LIB_TARGET}_HEADERS ${ALIASHEADERS})

if(APPLE)
if(${BUILD_FRAMEWORKS})
target_include_directories(${LIB_TARGET} PUBLIC $<BUILD_INTERFACE:$<TARGET_BUNDLE_CONTENT_DIR:${LIB_TARGET}>/Headers>)
Expand Down Expand Up @@ -128,10 +130,6 @@ macro(MAKE_LIBRARY LIB_TARGET HEADER_INSTALL_DIR)
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_INSTALL_DIR}
COMPONENT ff7tk_headers
)
install (FILES ${ALIASHEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_INSTALL_DIR}
COMPONENT ff7tk_headers
)

if(UNIX)
if(NOT APPLE)
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/data/CharEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,7 +1513,7 @@ void CharEditor::setTimesused2(int timesused)
if (timesused == data.timesused2)
return;
data.timesused2 = quint16(std::clamp(timesused, 0, quint16Max));
Q_EMIT times3UsedChanged(data.timesused2);
Q_EMIT times2UsedChanged(data.timesused2);
/* Remove for 2.0 */Q_EMIT timesused2_changed(data.timesused2);
}

Expand Down
Loading