diff options
| author | Wolfgang Schupp <wsnipex@a1.net> | 2022-06-19 16:06:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-19 16:06:16 +0200 |
| commit | 56d73c06bcdae271c4b35d12c2f6d20172ec0a18 (patch) | |
| tree | 081e5c09bf44c582dda45da2660fc2235ea4e89e | |
| parent | b30b36016bf77b8aa091fa52b88552d459355e6f (diff) | |
| parent | 464e779b54a9e039e569da271a1313b6045172c4 (diff) | |
Merge pull request #21580 from wsnipex/fix-texturepacker-install
[cmake] fix installing texturepacker on non-depends builds
| -rw-r--r-- | cmake/modules/buildtools/FindTexturePacker.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake index ce6311ec3b..dc30da066e 100644 --- a/cmake/modules/buildtools/FindTexturePacker.cmake +++ b/cmake/modules/buildtools/FindTexturePacker.cmake @@ -50,11 +50,11 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable) # and unset TEXTUREPACKER_EXECUTABLE variable message(WARNING "Could not find '${APP_NAME_LC}-TexturePacker' or 'TexturePacker' executable in ${_tppath} supplied by -DWITH_TEXTUREPACKER. Make sure the executable file name matches these names!") endif() - endif() - - # Ship TexturePacker only on Linux and FreeBSD - if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE) + else() + # Ship TexturePacker only on Linux and FreeBSD + if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE) + endif() endif() # Use it during build if build architecture can be executed on host |