From f64af5e6edc69b001b4cf66779a4d343c95f0180 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 2 Sep 2015 18:53:36 +0200 Subject: [PATCH 1/3] fixing typo that prevented verification of armadillo download --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24ec383ff..dba1fdfb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -721,7 +721,7 @@ if(NOT ARMADILLO_FOUND) message(STATUS " when doing 'make'. ") set(armadillo_RELEASE 5.400.3) - set(armadillo_MD5 "397733eb2f305b50f28ead3350d975bdc") + set(armadillo_MD5 "397733eb2f305b50f28ead3350d975bd") ExternalProject_Add( armadillo-${armadillo_RELEASE} From e843b3121d5c3dff29b6f10f6dac4b9447d991da Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 7 Sep 2015 17:16:03 -0700 Subject: [PATCH 2/3] Identifiying Mac OS X 10.11 El Capitan --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index dba1fdfb0..8580eb520 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,6 +194,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(OS_IS_MACOSX TRUE) exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) + if(${DARWIN_VERSION} MATCHES "15") + set(MACOSX_EL_CAPITAN TRUE) + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") + message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.11 El Capitan") + endif(${DARWIN_VERSION} MATCHES "15") if(${DARWIN_VERSION} MATCHES "14") set(MACOSX_YOSEMITE TRUE) set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11") From a969250640e47ff7a9efb3c33adcc79604da59da Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 7 Sep 2015 23:51:55 -0700 Subject: [PATCH 3/3] Adding a missing include --- src/core/libs/supl/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt index 1e4943c61..0be3c7f1c 100644 --- a/src/core/libs/supl/CMakeLists.txt +++ b/src/core/libs/supl/CMakeLists.txt @@ -25,9 +25,10 @@ set (SUPL_SOURCES include_directories( ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/src/core/libs/supl + ${CMAKE_SOURCE_DIR}/src/core/libs/supl ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl + ${OPENSSL_INCLUDE_DIR} ) if(CMAKE_C_COMPILER_ID MATCHES "Clang") @@ -39,4 +40,4 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}") add_library (supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES}) target_link_libraries (supl_library ssl gnss_system_parameters) -set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C) \ No newline at end of file +set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C)