Browse Source
CMake reorg, use my updated modules, CI vvl
CMake reorg, use my updated modules, CI vvl
Signed-off-by: crueter <crueter@eden-emu.dev>pull/2694/head
crueter
4 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
13 changed files with 211 additions and 424 deletions
-
113CMakeLists.txt
-
46CMakeModules/DetectArchitecture.cmake
-
122CMakeModules/DownloadQt.cmake
-
75CMakeModules/GetSCMRev.cmake
-
8cpmfile.json
-
40externals/CMakeLists.txt
-
162externals/cmake-modules/GetGitRevisionDescription.cmake
-
45externals/cmake-modules/GetGitRevisionDescription.cmake.in
-
7externals/cpmfile.json
-
11src/dynarmic/CMakeLists.txt
-
2src/dynarmic/CMakeModules/TargetArchitectureSpecificSources.cmake
-
2src/dynarmic/src/dynarmic/CMakeLists.txt
-
2src/dynarmic/tests/CMakeLists.txt
@ -1,22 +1,56 @@ |
|||
# SPDX-FileCopyrightText: 2025 crueter |
|||
# SPDX-License-Identifier: GPL-3.0-or-later |
|||
|
|||
## DetectArchitecture ## |
|||
#[[ |
|||
Does exactly as it sounds. Detects common symbols defined for different architectures and |
|||
adds compile definitions thereof. Namely: |
|||
- arm64 |
|||
- arm |
|||
- x86_64 |
|||
- x86 |
|||
- ia64 |
|||
- mips |
|||
- ppc64 |
|||
- ppc |
|||
- riscv |
|||
- wasm |
|||
|
|||
This file is based off of Yuzu and Dynarmic. |
|||
TODO: add SPARC |
|||
]] |
|||
include(CheckSymbolExists) |
|||
|
|||
# multiarch builds are a special case and also very difficult |
|||
# this is what I have for now, but it's not ideal |
|||
|
|||
# Do note that situations where multiple architectures are defined |
|||
# should NOT be too dependent on the architecture |
|||
# otherwise, you may end up with duplicate code |
|||
if (CMAKE_OSX_ARCHITECTURES) |
|||
set(DYNARMIC_MULTIARCH_BUILD 1) |
|||
set(MULTIARCH_BUILD 1) |
|||
set(ARCHITECTURE "${CMAKE_OSX_ARCHITECTURES}") |
|||
|
|||
# hope and pray the architecture names match |
|||
foreach(ARCH IN ${CMAKE_OSX_ARCHITECTURES}) |
|||
set(ARCHITECTURE_${ARCH} 1 PARENT_SCOPE) |
|||
add_definitions(-DARCHITECTURE_${ARCH}=1) |
|||
endforeach() |
|||
|
|||
return() |
|||
endif() |
|||
|
|||
function(detect_architecture symbol arch) |
|||
if (NOT DEFINED ARCHITECTURE) |
|||
set(CMAKE_REQUIRED_QUIET YES) |
|||
check_symbol_exists("${symbol}" "" DETECT_ARCHITECTURE_${arch}) |
|||
set(CMAKE_REQUIRED_QUIET 1) |
|||
check_symbol_exists("${symbol}" "" ARCHITECTURE_${arch}) |
|||
unset(CMAKE_REQUIRED_QUIET) |
|||
|
|||
if (DETECT_ARCHITECTURE_${arch}) |
|||
if (ARCHITECTURE_${arch}) |
|||
set(ARCHITECTURE "${arch}" PARENT_SCOPE) |
|||
set(ARCHITECTURE_${arch} 1 PARENT_SCOPE) |
|||
add_definitions(-DARCHITECTURE_${arch}=1) |
|||
endif() |
|||
|
|||
unset(DETECT_ARCHITECTURE_${arch} CACHE) |
|||
endif() |
|||
endfunction() |
|||
|
|||
@ -1,162 +0,0 @@ |
|||
# SPDX-FileCopyrightText: 2009 Iowa State University |
|||
# SPDX-FileContributor: Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> |
|||
# SPDX-License-Identifier: BSL-1.0 |
|||
|
|||
# - Returns a version string from Git |
|||
# |
|||
# These functions force a re-configure on each git commit so that you can |
|||
# trust the values of the variables in your build system. |
|||
# |
|||
# get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...]) |
|||
# |
|||
# Returns the refspec and sha hash of the current head revision |
|||
# |
|||
# git_describe(<var> [<additional arguments to git describe> ...]) |
|||
# |
|||
# Returns the results of git describe on the source tree, and adjusting |
|||
# the output so that it tests false if an error occurs. |
|||
# |
|||
# git_get_exact_tag(<var> [<additional arguments to git describe> ...]) |
|||
# |
|||
# Returns the results of git describe --exact-match on the source tree, |
|||
# and adjusting the output so that it tests false if there was no exact |
|||
# matching tag. |
|||
# |
|||
# Requires CMake 2.6 or newer (uses the 'function' command) |
|||
# |
|||
# Original Author: |
|||
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> |
|||
# http://academic.cleardefinition.com |
|||
# Iowa State University HCI Graduate Program/VRAC |
|||
# |
|||
# Copyright Iowa State University 2009-2010. |
|||
# Distributed under the Boost Software License, Version 1.0. |
|||
# (See accompanying file LICENSE_1_0.txt or copy at |
|||
# http://www.boost.org/LICENSE_1_0.txt) |
|||
|
|||
if(__get_git_revision_description) |
|||
return() |
|||
endif() |
|||
set(__get_git_revision_description YES) |
|||
|
|||
# We must run the following at "include" time, not at function call time, |
|||
# to find the path to this module rather than the path to a calling list file |
|||
get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH) |
|||
|
|||
function(get_git_head_revision _refspecvar _hashvar) |
|||
set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") |
|||
set(GIT_DIR "${GIT_PARENT_DIR}/.git") |
|||
while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories |
|||
set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}") |
|||
get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH) |
|||
if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT) |
|||
# We have reached the root directory, we are not in git |
|||
set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE) |
|||
set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE) |
|||
return() |
|||
endif() |
|||
set(GIT_DIR "${GIT_PARENT_DIR}/.git") |
|||
endwhile() |
|||
# check if this is a submodule |
|||
if(NOT IS_DIRECTORY ${GIT_DIR}) |
|||
file(READ ${GIT_DIR} submodule) |
|||
string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule}) |
|||
get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH) |
|||
get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE) |
|||
endif() |
|||
set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data") |
|||
if(NOT EXISTS "${GIT_DATA}") |
|||
file(MAKE_DIRECTORY "${GIT_DATA}") |
|||
endif() |
|||
|
|||
if(NOT EXISTS "${GIT_DIR}/HEAD") |
|||
return() |
|||
endif() |
|||
set(HEAD_FILE "${GIT_DATA}/HEAD") |
|||
configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY) |
|||
|
|||
configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in" |
|||
"${GIT_DATA}/grabRef.cmake" |
|||
@ONLY) |
|||
include("${GIT_DATA}/grabRef.cmake") |
|||
|
|||
set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE) |
|||
set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE) |
|||
endfunction() |
|||
|
|||
function(git_branch_name _var) |
|||
if(NOT GIT_FOUND) |
|||
find_package(Git QUIET) |
|||
endif() |
|||
|
|||
if(NOT GIT_FOUND) |
|||
set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) |
|||
return() |
|||
endif() |
|||
|
|||
execute_process(COMMAND |
|||
"${GIT_EXECUTABLE}" |
|||
rev-parse --abbrev-ref HEAD |
|||
WORKING_DIRECTORY |
|||
"${CMAKE_SOURCE_DIR}" |
|||
RESULT_VARIABLE |
|||
res |
|||
OUTPUT_VARIABLE |
|||
out |
|||
ERROR_QUIET |
|||
OUTPUT_STRIP_TRAILING_WHITESPACE) |
|||
if(NOT res EQUAL 0) |
|||
set(out "${out}-${res}-NOTFOUND") |
|||
endif() |
|||
|
|||
set(${_var} "${out}" PARENT_SCOPE) |
|||
endfunction() |
|||
|
|||
function(git_describe _var) |
|||
if(NOT GIT_FOUND) |
|||
find_package(Git QUIET) |
|||
endif() |
|||
#get_git_head_revision(refspec hash) |
|||
if(NOT GIT_FOUND) |
|||
set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) |
|||
return() |
|||
endif() |
|||
#if(NOT hash) |
|||
# set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE) |
|||
# return() |
|||
#endif() |
|||
|
|||
# TODO sanitize |
|||
#if((${ARGN}" MATCHES "&&") OR |
|||
# (ARGN MATCHES "||") OR |
|||
# (ARGN MATCHES "\\;")) |
|||
# message("Please report the following error to the project!") |
|||
# message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}") |
|||
#endif() |
|||
|
|||
#message(STATUS "Arguments to execute_process: ${ARGN}") |
|||
|
|||
execute_process(COMMAND |
|||
"${GIT_EXECUTABLE}" |
|||
describe |
|||
${hash} |
|||
${ARGN} |
|||
WORKING_DIRECTORY |
|||
"${CMAKE_SOURCE_DIR}" |
|||
RESULT_VARIABLE |
|||
res |
|||
OUTPUT_VARIABLE |
|||
out |
|||
ERROR_QUIET |
|||
OUTPUT_STRIP_TRAILING_WHITESPACE) |
|||
if(NOT res EQUAL 0) |
|||
set(out "${out}-${res}-NOTFOUND") |
|||
endif() |
|||
|
|||
set(${_var} "${out}" PARENT_SCOPE) |
|||
endfunction() |
|||
|
|||
function(git_get_exact_tag _var) |
|||
git_describe(out --exact-match ${ARGN}) |
|||
set(${_var} "${out}" PARENT_SCOPE) |
|||
endfunction() |
|||
@ -1,45 +0,0 @@ |
|||
# SPDX-FileCopyrightText: 2009 Iowa State University |
|||
# SPDX-FileContributor: Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> |
|||
# SPDX-License-Identifier: BSL-1.0 |
|||
|
|||
# Internal file for GetGitRevisionDescription.cmake |
|||
# |
|||
# Requires CMake 2.6 or newer (uses the 'function' command) |
|||
# |
|||
# Original Author: |
|||
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> |
|||
# http://academic.cleardefinition.com |
|||
# Iowa State University HCI Graduate Program/VRAC |
|||
# |
|||
# Copyright Iowa State University 2009-2010. |
|||
# Distributed under the Boost Software License, Version 1.0. |
|||
# (See accompanying file LICENSE_1_0.txt or copy at |
|||
# http://www.boost.org/LICENSE_1_0.txt) |
|||
|
|||
set(HEAD_HASH) |
|||
|
|||
file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024) |
|||
|
|||
string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS) |
|||
if(HEAD_CONTENTS MATCHES "ref") |
|||
# named branch |
|||
string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}") |
|||
if(EXISTS "@GIT_DIR@/${HEAD_REF}") |
|||
configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY) |
|||
elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}") |
|||
configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY) |
|||
set(HEAD_HASH "${HEAD_REF}") |
|||
endif() |
|||
else() |
|||
# detached HEAD |
|||
configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY) |
|||
endif() |
|||
|
|||
if(NOT HEAD_HASH) |
|||
if(EXISTS "@GIT_DATA@/head-ref") |
|||
file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024) |
|||
string(STRIP "${HEAD_HASH}" HEAD_HASH) |
|||
else() |
|||
set(HEAD_HASH "Unknown") |
|||
endif() |
|||
endif() |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue