Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • CMake CMake
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,929
    • Issues 3,929
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 19
    • Merge requests 19
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • External wiki
    • External wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • CMake
  • CMakeCMake
  • Merge requests
  • !6751

AutoMoc: Only add the WIN32 define if the target system is Windows

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Jörg Bornemann requested to merge jobor/cmake:fix-22933 into master Nov 19, 2021
  • Overview 2
  • Commits 1
  • Pipelines 2
  • Changes 1

When there's no moc_predefs.h generated, we add the WIN32 define as fallback.

Before this change, we added the WIN32 define if the host system was Windows. That's wrong when cross-compiling. Now we're checking whether the target system is Windows.

Fixes: #22933 (closed)
Topic-rename: automoc-cross-windows

Edited Nov 19, 2021 by Brad King
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: fix-22933