From 3f0f7931b84a4ec3a7e54d72c4388587952371f1 Mon Sep 17 00:00:00 2001 From: Patrick Plenefisch Date: Sat, 20 Sep 2014 15:41:38 -0400 Subject: [PATCH] Changing cmake to test the tests (Jenkins) Change-Id: I4f499c6325cdab399a51385c5acb73a665d9a9ae --- arm-toolchain.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arm-toolchain.cmake b/arm-toolchain.cmake index 7b5d1ffd60..6f70467200 100644 --- a/arm-toolchain.cmake +++ b/arm-toolchain.cmake @@ -1,12 +1,9 @@ cmake_minimum_required(VERSION 2.8) INCLUDE(CMakeForceCompiler) -set(ARM_PREFIX arm-none-linux-gnueabi) -#set(ARM_PREFIX arm-frc-linux-gnueabi) +set(ARM_PREFIX arm-frc-linux-gnueabi) set(CMAKE_SYSTEM_NAME Linux) CMAKE_FORCE_CXX_COMPILER(${ARM_PREFIX}-g++ GNU) CMAKE_FORCE_C_COMPILER(${ARM_PREFIX}-gcc GNU) set(CMAKE_CXX_FLAGS "-march=armv7-a -mcpu=cortex-a9 -mfloat-abi=softfp -Wall -Wno-psabi" CACHE STRING "" FORCE) set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3" CACHE STRING "" FORCE) set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g" CACHE STRING "" FORCE) # still want debugging for release? -#SET(CMAKE_FIND_ROOT_PATH /usr/arm-frc-linux-gnueabi) -SET(CMAKE_FIND_ROOT_PATH $ENV{USER_HOME}/wpilib/toolchains/arm-none-linux-gnueabi-4.4.1/arm-none-linux-gnueabi/libc)