Browse Source

Error out if tar can't be found.

Only applies for platforms other than Windows.
6.0.7
Érico Nogueira 4 years ago
committed by Mark Roszko
parent
commit
63b98d959b
  1. 14
      bitmaps_png/CMakeLists.txt

14
bitmaps_png/CMakeLists.txt

@ -749,11 +749,15 @@ endfunction()
include( FindUnixCommands ) include( FindUnixCommands )
# CMake on Windows CI seems to struggle to find tar even though it's in PATH
# Let's help it out as modern windows (Server 2019 and 10 provide tar)
if( MSVC AND TAR STREQUAL "TAR-NOTFOUND" )
# yolo
set( TAR "C:\\Windows\\System32\\tar.exe" )
if( TAR STREQUAL "TAR-NOTFOUND" )
# CMake on Windows CI seems to struggle to find tar even though it's in PATH
# Let's help it out as modern windows (Server 2019 and 10 provide tar)
if( MSVC )
# yolo
set( TAR "C:\\Windows\\System32\\tar.exe" )
else()
message( FATAL_ERROR "Could not find the tar program." )
endif()
endif() endif()
set( BITMAP_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/resources/images.tar.gz ) set( BITMAP_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/resources/images.tar.gz )

Loading…
Cancel
Save