From 107f378f7cd3909cb282d584581d81c7f526d684 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Wed, 24 Jul 2019 06:35:42 +0700
Subject: [PATCH] Fixed cmake again.

---
 CMakeLists.txt            | 10 ++++------
 src/backend/cpu/cpu.cmake |  2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca1292e4..fd2608b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,10 @@ option(BUILD_STATIC         "Build static binary" OFF)
 option(ARM_TARGET           "Force use specific ARM target 8 or 7" 0)
 option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+
+
 include (CheckIncludeFile)
 include (cmake/cpu.cmake)
 include (src/base/base.cmake)
@@ -143,14 +147,8 @@ endif()
 add_definitions(/D__STDC_FORMAT_MACROS)
 add_definitions(/DUNICODE)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-
 find_package(UV REQUIRED)
 
-if (WITH_HWLOC)
-    find_package(HWLOC REQUIRED)
-endif()
-
 if (WITH_RANDOMX)
     include_directories(src/crypto/randomx)
     add_definitions(/DXMRIG_ALGO_RANDOMX)
diff --git a/src/backend/cpu/cpu.cmake b/src/backend/cpu/cpu.cmake
index f0b1a486..dab30310 100644
--- a/src/backend/cpu/cpu.cmake
+++ b/src/backend/cpu/cpu.cmake
@@ -19,6 +19,8 @@ set(SOURCES_BACKEND_CPU
 
 
 if (WITH_HWLOC)
+    find_package(HWLOC REQUIRED)
+
     set(WITH_LIBCPUID OFF)
 
     include_directories(${HWLOC_INCLUDE_DIR})