From 55825890a6cd3abec976778d2a9409f03d5c1c3d Mon Sep 17 00:00:00 2001 From: InoriRus Date: Fri, 21 Jan 2022 16:13:20 +1000 Subject: [PATCH] fix build issue (#3) --- source/CMakeLists.txt | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 134916b..a00b6e7 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -50,6 +50,9 @@ if(MINGW) set(CLANG 1) set(KYTY_COMPILER CLANG) set(KYTY_LINKER LLD) + if ((CMAKE_AR MATCHES "llvm") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0.0) AND (CMAKE_CXX_COMPILER MATCHES "winlibs")) + string(REPLACE "llvm-ar.exe" "ar.exe" CMAKE_AR ${CMAKE_AR}) # llvm-ar.exe 11.0.0 from winlibs is broken + endif() else() set(KYTY_COMPILER MINGW) set(KYTY_LINKER LD) @@ -110,24 +113,25 @@ add_custom_target( KytyGitVersion COMMENT "Generate KytyGitVersion.h" ) -list(APPEND KYTY_IWYU - emulator_obj - core_obj - #math_obj - #scripts_obj - #sys_obj - launcher -) - -list(APPEND KYTY_CLANG_TYDY - emulator_obj - core_obj - #core - #math_obj - #scripts_obj - #sys_obj - launcher -) +if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0.0) + list(APPEND KYTY_IWYU + emulator_obj + core_obj + #math_obj + #scripts_obj + #sys_obj + launcher + ) + list(APPEND KYTY_CLANG_TYDY + emulator_obj + core_obj + #core + #math_obj + #scripts_obj + #sys_obj + launcher + ) +endif() set(KYTY_LIB_HEADERS ${PROJECT_SOURCE_DIR}/include)