Skip to content

Commit fb9b5ab

Browse files
committed
yokai: some prefix rework
1 parent 89f87d9 commit fb9b5ab

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

cmake/Yokai/Architecture.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ option(USE_ARCH_INTRINSICS "Enable custom code using intrinsics functions or asm
3434
mark_as_advanced(USE_ARCH_INTRINSICS)
3535

3636
function(yokai_detect_arch)
37-
yokai_run_detection("TARGET_" "ARCH" "Architecture.c" "")
37+
yokai_run_detection("TARGET" "ARCH" "Architecture.c" "")
3838

3939
set(YOKAI_TARGET_ARCH_NAME "${arch_name}" PARENT_SCOPE)
4040
set(YOKAI_TARGET_ARCH_NAME_UPPER "${arch_name_upper}" PARENT_SCOPE)

cmake/Yokai/Compiler.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function(yokai_detect_compiler lang)
3939

4040
get_filename_component(compiler_basename "${CMAKE_${lang}_COMPILER}" NAME)
4141

42-
yokai_run_detection("${lang}_" "COMPILER" "Compiler${${lang}_EXT}" "GCC;Clang;generic")
42+
yokai_run_detection("${lang}" "COMPILER" "Compiler${${lang}_EXT}" "GCC;Clang;generic")
4343

4444
if (compiler_name STREQUAL "Unknown")
4545
if (CMAKE_${lang}_COMPILER_ID)

cmake/Yokai/Detection.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ macro(yokai_run_detection slug_prefix report_slug file_name compat_list)
7676
string(REGEX REPLACE ${COMPATIBILITY_REGEX} "\\1"
7777
${local_slug}_${name}_compatibility "${build_log}")
7878

79-
set("YOKAI_${slug_prefix}${report_slug}_${name_upper}_COMPATIBILITY"
79+
set("YOKAI_${slug_prefix}_${report_slug}_${name_upper}_COMPATIBILITY"
8080
"${${local_slug}_${name}_compatibility}"
8181
PARENT_SCOPE)
8282
endif()
@@ -86,7 +86,7 @@ macro(yokai_run_detection slug_prefix report_slug file_name compat_list)
8686
string(REGEX REPLACE ${VERSION_REGEX} "\\1"
8787
${local_slug}_${name}_version "${build_log}")
8888

89-
set("YOKAI_${slug_prefix}${report_slug}_${name_upper}_VERSION"
89+
set("YOKAI_${slug_prefix}_${report_slug}_${name_upper}_VERSION"
9090
"${${local_slug}_${name}_version}"
9191
PARENT_SCOPE)
9292
endif()

cmake/Yokai/System.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function(yokai_detect_host_system)
6868
endfunction()
6969

7070
function(yokai_detect_system)
71-
yokai_run_detection("TARGET_" "SYSTEM" "System.c" "Linux")
71+
yokai_run_detection("TARGET" "SYSTEM" "System.c" "Linux")
7272

7373
if (system_name STREQUAL "Unknown")
7474
detect_cmake_host_system("system_name")

0 commit comments

Comments
 (0)