From 6a24b65d6464c35f9e4b97783f2ae71ecd4acae5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 8 Mar 2019 10:28:04 +0100 Subject: [PATCH] Fix for VS --- .../volk_gnsssdr/lib/CMakeLists.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt index 5211c1cf5..095028f60 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt @@ -313,6 +313,9 @@ if(NOT CROSSCOMPILE_MULTILIB AND CPU_IS_x86) #MSVC 64 bit does not have MMX, overrule it if(${SIZEOF_CPU} EQUAL 64 AND MSVC) overrule_arch(mmx "No MMX for Win64") + if(MSVC_VERSION GREATER 1700) + OVERRULE_ARCH(sse "No SSE for Win64 Visual Studio 2013") + endif() endif() endif() @@ -582,7 +585,7 @@ target_include_directories(volk_gnsssdr_obj #Add dynamic library add_library(volk_gnsssdr SHARED $) -target_link_libraries(volk_gnsssdr ${volk_gnsssdr_libraries} m) +target_link_libraries(volk_gnsssdr ${volk_gnsssdr_libraries}) target_include_directories(volk_gnsssdr PUBLIC $ PUBLIC $ @@ -593,7 +596,10 @@ target_include_directories(volk_gnsssdr ) #Configure target properties -set_target_properties(volk_gnsssdr_obj PROPERTIES COMPILE_FLAGS "-fPIC") +if(NOT MSVC) + set_target_properties(volk_gnsssdr_obj PROPERTIES COMPILE_FLAGS "-fPIC") + target_link_libraries(volk_gnsssdr m) +endif() set_target_properties(volk_gnsssdr PROPERTIES SOVERSION ${LIBVER}) set_target_properties(volk_gnsssdr PROPERTIES DEFINE_SYMBOL "volk_gnsssdr_EXPORTS") @@ -608,7 +614,10 @@ install(TARGETS volk_gnsssdr #Configure static library if(ENABLE_STATIC_LIBS) add_library(volk_gnsssdr_static STATIC $) - target_link_libraries(volk_gnsssdr_static ${volk_gnsssdr_libraries} pthread m) + target_link_libraries(volk_gnsssdr_static ${volk_gnsssdr_libraries} pthread) + if(NOT MSVC) + target_link_libraries(volk_gnsssdr_static m) + endif() target_include_directories(volk_gnsssdr_static PUBLIC $ PUBLIC $