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

Fix CMake compilation and localization #63208

Merged
merged 1 commit into from
Jan 22, 2023
Merged

Fix CMake compilation and localization #63208

merged 1 commit into from
Jan 22, 2023

Conversation

Qrox
Copy link
Contributor

@Qrox Qrox commented Jan 20, 2023

Summary

Build "Fix CMake mixed signature error and outdated localization code"

Purpose of change

Fix the following issues I found when compiling:

Compilation:

  • target_link_libraries mixed signature error
  • A target name typo

Localization:

  • Outdated .gitignore entry
  • Outdated documentation of .mo file compilation
  • Outdated .pot generation code

Describe the solution

Add explicit PUBLIC/PRIVATE keywords to target_link_libraries calls. Fix a target name that should be cataclysm-common instead of cataclysm-tiles-common.

Remove outdated .gitignore entry of en.po and update documentation of CMake localization. Replace the very outdated .pot generation code in lang/CMakeLists.txt with a call to update_pot.sh instead.

Testing

The game now compiles without the mixed signature error. update_pot.sh runs when translations target is specified.

Additional context

N/A

@Qrox
Fix CMake compilation and localization
b5f3431 
Localization:
- Outdated .gitignore entry
- Outdated documentation of .mo file compilation
- Outdated .pot generation code

Compilation:
- `target_link_libraries` mixed signature error
- Target name typo
@Qrox Qrox requested a review from BrettDong as a code owner January 20, 2023 15:33
@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [Markdown] Markdown issues and PRs Code: Build Issues regarding different builds and build environments Code: Tests Measurement, self-control, statistics, balancing. Code: Tooling Tooling that is not part of the main game but is part of the repo. Translation I18n astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jan 20, 2023
@dseguin dseguin merged commit 7878eaf into CleverRaven:master Jan 22, 2023
Willenbrink pushed a commit to Willenbrink/Cataclysm-DDA that referenced this pull request Jan 25, 2023
@Qrox @Willenbrink
Fix CMake compilation and localization (CleverRaven#63208)
9e47bc7 
Localization:
- Outdated .gitignore entry
- Outdated documentation of .mo file compilation
- Outdated .pot generation code

Compilation:
- `target_link_libraries` mixed signature error
- Target name typo
@Qrox Qrox deleted the fix-compile branch February 3, 2023 15:39
@olanti-p olanti-p mentioned this pull request Oct 17, 2023
Merged
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BrettDong BrettDong Awaiting requested review from BrettDong

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Build Issues regarding different builds and build environments Code: Tests Measurement, self-control, statistics, balancing. Code: Tooling Tooling that is not part of the main game but is part of the repo. <Documentation> Design documents, internal info, guides and help. json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Translation I18n
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Qrox @dseguin