From 4998f59e579ed9c52d4d5853f85e4c26132563eb Mon Sep 17 00:00:00 2001
From: netrunnereve <139727413+netrunnereve@users.noreply.github.com>
Date: Thu, 2 Nov 2023 22:01:17 -0400
Subject: [PATCH] fix merge

---
 CMakeLists.txt       | 15 +++++----------
 cmake/FindSIMD.cmake |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45d7a5d71..2aee3e0db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,11 +100,6 @@ option(LLAMA_BUILD_TESTS                "llama: build tests"    ${LLAMA_STANDALO
 option(LLAMA_BUILD_EXAMPLES             "llama: build examples" ${LLAMA_STANDALONE})
 option(LLAMA_BUILD_SERVER               "llama: build server example"                           ON)
 
-# instruction set detection for MSVC only
-if (LLAMA_NATIVE)
-    include(cmake/FindSIMD.cmake)
-endif ()
-
 #
 # Build info header
 #
@@ -138,11 +133,6 @@ else()
     message(WARNING "Git repository not found; to enable automatic generation of build info, make sure Git is installed and the project is a Git repository.")
 endif()
 
-if(LLAMA_NATIVE)
-    include(cmake/FindSIMD.cmake)
-endif()
->>>>>>> 8a2a73102c8b7af446af0350282b65d7820fe4ac
-
 #
 # Compile flags
 #
@@ -524,6 +514,11 @@ if (NOT MSVC)
     endif()
 endif()
 
+# instruction set detection for MSVC only
+if (LLAMA_NATIVE)
+    include(cmake/FindSIMD.cmake)
+endif ()
+
 if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") OR ("${CMAKE_GENERATOR_PLATFORM_LWR}" MATCHES "arm64"))
     message(STATUS "ARM detected")
     if (MSVC)
diff --git a/cmake/FindSIMD.cmake b/cmake/FindSIMD.cmake
index dac993a2a..a7dd48890 100644
--- a/cmake/FindSIMD.cmake
+++ b/cmake/FindSIMD.cmake
@@ -58,7 +58,7 @@ macro(check_sse type flags)
   foreach(__FLAG ${flags})
     if(NOT ${type}_FOUND)
       set(CMAKE_REQUIRED_FLAGS ${__FLAG})
-      CHECK_C_SOURCE_RUNS("${${type}_CODE}" HAS_${type}_${__FLAG_I})
+      check_c_source_runs("${${type}_CODE}" HAS_${type}_${__FLAG_I})
       if(HAS_${type}_${__FLAG_I})
         set(${type}_FOUND TRUE CACHE BOOL "${type} support")
         set(${type}_FLAGS "${__FLAG}" CACHE STRING "${type} flags")