mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-11-01 15:53:03 +00:00
Upgrading Armadillo version. Removed some warnings when building in Release with clang.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@469 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
@@ -31,5 +31,5 @@ include_directories(
|
||||
)
|
||||
|
||||
add_library(out_adapters ${OUTPUTFILTER_ADAPTER_SOURCES})
|
||||
add_dependencies(out_adapters glog-${glog_RELEASE})
|
||||
target_link_libraries(out_adapters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})
|
||||
add_dependencies(out_adapters glog-${glog_RELEASE})
|
||||
@@ -29,9 +29,14 @@ include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
|
||||
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
|
||||
)
|
||||
|
||||
|
||||
|
||||
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
|
||||
if(CMAKE_BUILD_TYPE MATCHES "Release")
|
||||
set(MY_C_FLAGS "${MY_C_FLAGS} -Wno-parentheses-equality")
|
||||
endif(CMAKE_BUILD_TYPE MATCHES "Release")
|
||||
endif(CMAKE_C_COMPILER_ID MATCHES "Clang")
|
||||
list(APPEND 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)
|
||||
set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C)
|
||||
Reference in New Issue
Block a user