From 44dd51cbe8453cbd447a2114ebac0fbe47980907 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Fri, 15 Apr 2016 03:40:58 -0400 Subject: [PATCH] linux-armv7: Specify system processor and fix library finding. This commit updates the toolchain to ensure libraries associated with arm can be found. While a new root path needed to be set for armv6, the most recent armv7 toolchain doesn't require to explicitly set a new root. --- linux-armv7/Toolchain.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-armv7/Toolchain.cmake b/linux-armv7/Toolchain.cmake index 49c5efd..51601a9 100644 --- a/linux-armv7/Toolchain.cmake +++ b/linux-armv7/Toolchain.cmake @@ -1,5 +1,6 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) +set(CMAKE_SYSTEM_PROCESSOR arm) set(cross_triple "arm-linux-gnueabihf") @@ -7,9 +8,8 @@ set(CMAKE_C_COMPILER /usr/bin/${cross_triple}-cc) set(CMAKE_CXX_COMPILER /usr/bin/${cross_triple}-c++) set(CMAKE_Fortran_COMPILER /usr/bin/${cross_triple}-gfortran) -set(CMAKE_FIND_ROOT_PATH /usr/${cross_triple}) -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +# Discard path returned by pkg-config and associated with HINTS in module +# like FindOpenSSL. +set(CMAKE_IGNORE_PATH /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/lib/) set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)