xaymar/BlitzLLVM
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Further progress towards building with one click

Browse Source 
We've mostly got things to work, but CMake gets stuck trying to figure out the ABI. I'm not entirely sure what its doing.
This commit is contained in:
Xaymar
2025-04-18 15:16:02 +02:00
parent ebab168283
commit e29c9161c8
3 changed files with 183 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/generators/ninja.cmake
+15 -12
View File
@@ -74,7 +74,7 @@ if(IS_EXECUTABLE "${NINJA_BIN}")
message(STATUS "Found outdated v${NINJA_VERSION_INSTALLED}.")
unset(NINJA_BIN)
else()
message(STATUS "Found v${NINJA_VERSION_INSTALLED}.")
#message(STATUS "Found v${NINJA_VERSION_INSTALLED}.")
endif()
endif()
@@ -109,12 +109,16 @@ if((NOT IS_EXECUTABLE "${NINJA_BIN}") OR (NINJA_VERSION_INSTALLED VERSION_LESS N
endif()
# Download the ideal version.
message(STATUS "Downloading Ninja v${NINJA_VERSION}...")
file(DOWNLOAD
"https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/${_FILE_NAME}.${_FILE_EXT}"
"${NINJA_DIR}.${_FILE_EXT}"
SHOW_PROGRESS
)
if(NOT EXISTS "${NINJA_DIR}.${_FILE_EXT}")
message(STATUS "Downloading Ninja v${NINJA_VERSION}...")
file(DOWNLOAD
"https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/${_FILE_NAME}.${_FILE_EXT}"
"${NINJA_DIR}.${_FILE_EXT}"
SHOW_PROGRESS
)
else()
message(STATUS "Skipping download as file already exists.")
endif()
# Extract it.
message(STATUS "Extracting...")
@@ -147,11 +151,10 @@ if((NOT IS_EXECUTABLE "${NINJA_BIN}") OR (NINJA_VERSION_INSTALLED VERSION_LESS N
endif()
if((NOT IS_EXECUTABLE "${NINJA_BIN}") OR (NINJA_VERSION_INSTALLED VERSION_LESS NINJA_VERSION))
message(STATUS "NINJA_DIR=${NINJA_DIR}")
message(STATUS "NINJA_BIN=${NINJA_BIN}")
message(STATUS "NINJA_VERSION=${NINJA_VERSION}")
message(STATUS "NINJA_VERSION_INSTALLED=${NINJA_VERSION_INSTALLED}")
message(FATAL_ERROR "Failed to install newer version of Ninja.")
elseif(IS_EXECUTABLE "${NINJA_BIN}")
message(STATUS "Found v${NINJA_VERSION_INSTALLED}.")
endif()
set(CMAKE_MAKE_PROGRAM "${NINJA_BIN}" CACHE STRING "" FORCE)
set(CMAKE_MAKE_PROGRAM "${NINJA_BIN}" CACHE STRING "" FORCE)
list(POP_BACK CMAKE_MESSAGE_INDENT)