From cf2b5b643b53f7f601420a32a032307307fa4bb2 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 8 Nov 2014 15:31:30 +0100 Subject: [PATCH] CMakeLists.txt: Fix CMAKE_MODULE_PATH related issue. Append to CMAKE_MODULE_PATH instead of overwriting it, in case it is non-empty initially (which can happen e.g. if -DCMAKE_TOOLCHAIN_FILE is used and the specified toolchain file sets CMAKE_MODULE_PATH). Also, append to CMAKE_MODULE_PATH _after_ running "project(pulseview)", since the latter would apparently reset CMAKE_MODULE_PATH again. This should fix a MinGW-w64 build issue we're currently seeing: CMake Error at CMakeLists.txt:105 (include): include could not find load file: memaccess --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ee1d57..4af1f67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,10 +23,10 @@ cmake_minimum_required(VERSION 2.8.6) include(FindPkgConfig) include(GNUInstallDirs) -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") - project(pulseview) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") + #=============================================================================== #= User Options #------------------------------------------------------------------------------- -- 2.30.2