]> sigrok.org Git - pulseview.git/commitdiff
CMakeLists.txt: Fix CMAKE_MODULE_PATH related issue.
authorUwe Hermann <redacted>
Sat, 8 Nov 2014 14:31:30 +0000 (15:31 +0100)
committerUwe Hermann <redacted>
Sat, 8 Nov 2014 14:38:17 +0000 (15:38 +0100)
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

index 8ee1d57a3d6ac2d29e826f31967c9090018c0b7a..4af1f67bdaed73fee301c85b3ed5af3758434652 100644 (file)
@@ -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
 #-------------------------------------------------------------------------------