From 0b64e8a9ee48aad6824357719380ac4b607f4d0a Mon Sep 17 00:00:00 2001 From: Paul Sutton Date: Fri, 2 Jun 2017 15:59:03 +0100 Subject: [PATCH 1/4] Minor cleanup of security library handling in cmake --- CMakeLists.txt | 12 +++++------- lib/src/common/CMakeLists.txt | 2 +- lib/test/common/CMakeLists.txt | 4 ++-- srsenb/CMakeLists.txt | 4 ++-- srsenb/src/CMakeLists.txt | 2 +- srsenb/test/upper/CMakeLists.txt | 2 +- srsue/CMakeLists.txt | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9998e1f9e..4a567ef5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,17 +74,15 @@ find_package(Threads REQUIRED) find_package(Polarssl) if (POLARSSL_FOUND) - set(POLAR_INCLUDE_DIRS "${POLARSSL_INCLUDE_DIRS}") - set(POLAR_LIBRARIES "${POLARSSL_LIBRARIES}") + set(SEC_INCLUDE_DIRS "${POLARSSL_INCLUDE_DIRS}") + set(SEC_LIBRARIES "${POLARSSL_LIBRARIES}") add_definitions(-DHAVE_POLARSSL) else(POLARSSL_FOUND) - find_package(MbedTLS) + find_package(MbedTLS REQUIRED) if (MBEDTLS_FOUND) - set(POLAR_INCLUDE_DIRS "${MBEDTLS_INCLUDE_DIRS}") - set(POLAR_LIBRARIES "${MBEDTLS_LIBRARIES}") + set(SEC_INCLUDE_DIRS "${MBEDTLS_INCLUDE_DIRS}") + set(SEC_LIBRARIES "${MBEDTLS_LIBRARIES}") add_definitions(-DHAVE_MBEDTLS) - else(MBEDTLS_FOUND) - message(FATAL_ERROR "Either polarssl or mbedtls is required to compile srsLTE") endif (MBEDTLS_FOUND) endif(POLARSSL_FOUND) diff --git a/lib/src/common/CMakeLists.txt b/lib/src/common/CMakeLists.txt index 43a3aef0f..e460900a1 100644 --- a/lib/src/common/CMakeLists.txt +++ b/lib/src/common/CMakeLists.txt @@ -21,6 +21,6 @@ file(GLOB CXX_SOURCES "*.cc") file(GLOB C_SOURCES "*.c") add_library(srslte_common SHARED ${C_SOURCES} ${CXX_SOURCES}) -target_link_libraries(srslte_common ${POLAR_LIBRARIES}) +target_link_libraries(srslte_common ${SEC_LIBRARIES}) install(TARGETS srslte_common DESTINATION ${LIBRARY_DIR}) SRSLTE_SET_PIC(srslte_common) diff --git a/lib/test/common/CMakeLists.txt b/lib/test/common/CMakeLists.txt index 4fc924038..3faa2ff59 100644 --- a/lib/test/common/CMakeLists.txt +++ b/lib/test/common/CMakeLists.txt @@ -22,7 +22,7 @@ # LOGGER TEST ####################################################################### add_executable(logger_test logger_test.cc) -target_link_libraries(logger_test srslte_phy srslte_common srslte_phy ${POLAR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) +target_link_libraries(logger_test srslte_phy srslte_common srslte_phy ${SEC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) add_test(logger_test logger_test) add_executable(msg_queue_test msg_queue_test.cc) @@ -30,7 +30,7 @@ target_link_libraries(msg_queue_test srslte_phy srslte_common ${CMAKE_THREAD_LIB add_test(msg_queue_test msg_queue_test) add_executable(log_filter_test log_filter_test.cc) -target_link_libraries(log_filter_test srslte_phy srslte_common srslte_phy ${POLAR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) +target_link_libraries(log_filter_test srslte_phy srslte_common srslte_phy ${SEC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) add_executable(timeout_test timeout_test.cc) target_link_libraries(timeout_test srslte_phy ${CMAKE_THREAD_LIBS_INIT}) diff --git a/srsenb/CMakeLists.txt b/srsenb/CMakeLists.txt index f95ad191c..7fa60301a 100644 --- a/srsenb/CMakeLists.txt +++ b/srsenb/CMakeLists.txt @@ -34,13 +34,13 @@ endif() ######################################################################## include_directories( ${Boost_INCLUDE_DIRS} - ${POLAR_INCLUDE_DIRS} + ${SEC_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/srsenb/hdr ) link_directories( ${Boost_LIBRARY_DIRS} - ${POLAR_LIBRARY_DIRS} + ${SEC_LIBRARY_DIRS} ) ######################################################################## diff --git a/srsenb/src/CMakeLists.txt b/srsenb/src/CMakeLists.txt index 34fb66eef..199650fac 100644 --- a/srsenb/src/CMakeLists.txt +++ b/srsenb/src/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(srsenb srsenb_upper srslte_radio ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} - ${POLAR_LIBRARIES} + ${SEC_LIBRARIES} ${LIBCONFIGPP_LIBRARIES} ${SCTP_LIBRARIES}) diff --git a/srsenb/test/upper/CMakeLists.txt b/srsenb/test/upper/CMakeLists.txt index 7d11679e7..243da5cdf 100644 --- a/srsenb/test/upper/CMakeLists.txt +++ b/srsenb/test/upper/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(ip_test_enb srsenb_upper srslte_radio ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} - ${POLAR_LIBRARIES}) + ${SEC_LIBRARIES}) # Simple PLMN -> MCC/MNC test add_executable(plmn_test plmn_test.cc) diff --git a/srsue/CMakeLists.txt b/srsue/CMakeLists.txt index 6d257cde0..85f391d6b 100644 --- a/srsue/CMakeLists.txt +++ b/srsue/CMakeLists.txt @@ -30,13 +30,13 @@ endif() ######################################################################## include_directories( ${Boost_INCLUDE_DIRS} - ${POLAR_INCLUDE_DIRS} + ${SEC_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/srsue/hdr ) link_directories( ${Boost_LIBRARY_DIRS} - ${POLAR_LIBRARY_DIRS} + ${SEC_LIBRARY_DIRS} ) ######################################################################## From 0b21353c4aaeceb58ee02851a7abda335c1de8da Mon Sep 17 00:00:00 2001 From: Paul Sutton Date: Fri, 2 Jun 2017 17:23:12 +0100 Subject: [PATCH 2/4] Fixing srslte library headers install --- CMakeLists.txt | 9 --------- lib/CMakeLists.txt | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a567ef5a..9ec1476fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,15 +190,6 @@ set(INCLUDE_DIR include) set(DOC_DIR "share/doc/${CPACK_PACKAGE_NAME}") set(DATA_DIR share/${CPACK_PACKAGE_NAME}) - -######################################################################## -# Install headers -######################################################################## -INSTALL(DIRECTORY include/ - DESTINATION "${INCLUDE_DIR}" - FILES_MATCHING PATTERN "*.h" -) - ######################################################################## # Compiler specific setup ######################################################################## diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index f35e79bf2..6b638cef5 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -25,3 +25,10 @@ add_subdirectory(src) add_subdirectory(include) add_subdirectory(examples) add_subdirectory(test) + +######################################################################## +# Install library headers +######################################################################## +INSTALL( DIRECTORY include/ + DESTINATION "${INCLUDE_DIR}" + FILES_MATCHING PATTERN "*.h" ) From eb5460174d8ec2a78110614c54aa70c25b243b89 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Mon, 5 Jun 2017 13:12:02 +0200 Subject: [PATCH 3/4] fixing namespace issue in debug build --- lib/include/srslte/upper/rlc_common.h | 2 +- lib/test/upper/rlc_am_data_test.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/include/srslte/upper/rlc_common.h b/lib/include/srslte/upper/rlc_common.h index e45901855..0c545b60f 100644 --- a/lib/include/srslte/upper/rlc_common.h +++ b/lib/include/srslte/upper/rlc_common.h @@ -179,6 +179,6 @@ public: virtual void write_pdu(uint8_t *payload, uint32_t nof_bytes) = 0; }; -} // namespace srsue +} // namespace srslte #endif // RLC_COMMON_H diff --git a/lib/test/upper/rlc_am_data_test.cc b/lib/test/upper/rlc_am_data_test.cc index faeb07eb5..d2dfe5949 100644 --- a/lib/test/upper/rlc_am_data_test.cc +++ b/lib/test/upper/rlc_am_data_test.cc @@ -40,7 +40,7 @@ uint32_t PDU2_LEN = 5; uint8_t pdu3[] = {0x8C, 0x00, 0xDD, 0xCD, 0xDC, 0x5D, 0xC0}; uint32_t PDU3_LEN = 7; -using namespace srsue; +using namespace srslte; int main(int argc, char **argv) { srslte::rlc_amd_pdu_header_t h; From fd5502cfc9b9d2115dba332655d90e0494a4a88b Mon Sep 17 00:00:00 2001 From: Paul Sutton Date: Tue, 6 Jun 2017 14:15:49 +0100 Subject: [PATCH 4/4] Fix for SSE check in case -std=c99 hasn't been defined beforehand --- cmake/modules/FindSSE.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindSSE.cmake b/cmake/modules/FindSSE.cmake index 959022fa7..30be8a206 100644 --- a/cmake/modules/FindSSE.cmake +++ b/cmake/modules/FindSSE.cmake @@ -49,7 +49,8 @@ if (ENABLE_SSE) b = _mm256_loadu_ps( src ); c = _mm256_add_ps( a, b ); _mm256_storeu_ps( dst, c ); - for( int i = 0; i < 8; i++ ){ + int i = 0; + for( i = 0; i < 8; i++ ){ if( ( src[i] + src[i] ) != dst[i] ){ return -1; } @@ -82,7 +83,8 @@ if (ENABLE_SSE) b = _mm256_loadu_si256( (__m256i*)src ); c = _mm256_add_epi32( a, b ); _mm256_storeu_si256( (__m256i*)dst, c ); - for( int i = 0; i < 8; i++ ){ + int i = 0; + for( i = 0; i < 8; i++ ){ if( ( src[i] + src[i] ) != dst[i] ){ return -1; }