From 256bff8d1897831fe91711375d677853ccd957ab Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 19 Oct 2013 13:26:48 +0000 Subject: [PATCH] Fixes armadillo building when it is not already installed in the system and has to be linked statically git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@425 64b25241-fba3-4117-9849-534c7e92360d --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca4c634dc..e4614797c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -397,8 +397,7 @@ if(NOT ARMADILLO_FOUND) URL http://sourceforge.net/projects/arma/files/armadillo-${armadillo_RELEASE}.tar.gz DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/download/armadillo-${armadillo_RELEASE} URL_MD5 ${armadillo_MD5} - PATCH_COMMAND patch -N /CMakeLists.txt ${ARMADILLO_PATCH_FILE} - CONFIGURE_COMMAND /configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE} + PATCH_COMMAND patch -N /CMakeLists.txt ${ARMADILLO_PATCH_FILE} BUILD_IN_SOURCE 1 BUILD_COMMAND make UPDATE_COMMAND ""