mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-08 19:23:07 +00:00
Code Issues Releases Wiki Activity

Fix dll linkage in windows

Browse Source
This commit is contained in:
Carles Fernandez
2020-08-22 11:01:49 +02:00
parent 96f07fa27b
commit 2a21ee6a54
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
View File

@@ -573,10 +573,11 @@ if(NOT (CMAKE_GENERATOR STREQUAL Xcode))
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
) )
if(USE_CPU_FEATURES) if(USE_CPU_FEATURES)
target_include_directories(volk_gnsssdr_obj # target_include_directories(volk_gnsssdr_obj
PRIVATE # PRIVATE
$<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES> # $<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
) # )
target_link_libraries(volk_gnsssdr_obj PRIVATE cpu_features)
endif() endif()
# Configure object target properties # Configure object target properties
if(NOT MSVC) if(NOT MSVC)
@@ -592,7 +593,8 @@ else()
endif() endif()
if(USE_CPU_FEATURES) if(USE_CPU_FEATURES)
target_link_libraries(volk_gnsssdr target_link_libraries(volk_gnsssdr
PRIVATE ${volk_gnsssdr_libraries} cpu_features PUBLIC ${volk_gnsssdr_libraries}
PRIVATE cpu_features
) )
else() else()
target_link_libraries(volk_gnsssdr PUBLIC ${volk_gnsssdr_libraries}) target_link_libraries(volk_gnsssdr PUBLIC ${volk_gnsssdr_libraries})
@@ -650,12 +652,6 @@ if(ENABLE_STATIC_LIBS)
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
) )
if(USE_CPU_FEATURES)
target_include_directories(volk_gnsssdr_static
PRIVATE
$<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
)
endif()
set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr) set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr)