From 66536f2d5d199fee702e9b68e3665cd907ff21fc Mon Sep 17 00:00:00 2001 From: Ryan Tucker Date: Sun, 29 Sep 2013 12:54:25 -0400 Subject: [PATCH] Update cmake_minimum_required to 2.8.3 for host/ Resolves issue #123 host/CMakeLists.txt uses CMAKE_CURRENT_LIST_DIR, which does not exist before 2.8.3. Updating this to avoid obscure build errors on old machines. Also adding a few missing cmake_minimum_required directives to avoid a warning that likes to pop up when they're missing. --- fx3_firmware/CMakeLists.txt | 2 ++ host/CMakeLists.txt | 2 +- host/libraries/libbladeRF/include/CMakeLists.txt | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fx3_firmware/CMakeLists.txt b/fx3_firmware/CMakeLists.txt index 5eeda899..5cfe753d 100644 --- a/fx3_firmware/CMakeLists.txt +++ b/fx3_firmware/CMakeLists.txt @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 2.8) + add_custom_target(fx3_firmware ALL COMMAND ${CMAKE_MAKE_PROGRAM} OUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}/build WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index a1a502fc..04f49ad5 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -8,7 +8,7 @@ # the CMakeLists.txt from the rtl-sdr project. # http://sdr.osmocom.org/trac/wiki/rtl-sdr -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.3) project(bladeRF C) ################################################################################ diff --git a/host/libraries/libbladeRF/include/CMakeLists.txt b/host/libraries/libbladeRF/include/CMakeLists.txt index 8887adad..16e3c277 100644 --- a/host/libraries/libbladeRF/include/CMakeLists.txt +++ b/host/libraries/libbladeRF/include/CMakeLists.txt @@ -4,6 +4,8 @@ # # TODO license text here (see top-level COPYING for time being) +cmake_minimum_required(VERSION 2.8) + ################################################################################ # Install libbladeRF header files ################################################################################