From 8f12cbc466c1ba2ad0e456a247890c529a1ce20f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 4 Nov 2019 21:09:11 +0100 Subject: [PATCH] Include Visual Studio 14 --- .../volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 7af889751..80a3d6511 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 @@ -405,6 +405,8 @@ if(MSVC) set(cmake_c_compiler_version "Microsoft Visual Studio 11.0") elseif(MSVC12) #Visual Studio 12 set(cmake_c_compiler_version "Microsoft Visual Studio 12.0") + elseif(MSVC14) #Visual Studio 14 + set(cmake_c_compiler_version "Microsoft Visual Studio 14.0") endif() else() execute_process(COMMAND ${CMAKE_C_COMPILER} --version @@ -625,12 +627,12 @@ if(ENABLE_STATIC_LIBS) PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ) + set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr) + install(TARGETS volk_gnsssdr_static EXPORT VOLK_GNSSSDR-export ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_devel" ) - - set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr) endif() ########################################################################