Merge pull request #1069 from slyshykO/fix-msvc-build

Link for WIN32 & APPLE with stlink-static

CMakeLists.txt

@@ -155,11 +155,7 @@ execute_process(COMMAND bash -c "export LD_LIBRARY_PATH=${CMAKE_INSTALL_LIBDIR}"
 ###
 
 # Set library name
-if (NOT WIN32)
-    set(STLINK_LIB_SHARED ${PROJECT_NAME})
-else (WIN32)
-    set(STLINK_LIB_SHARED ${PROJECT_NAME}-shared)
-endif ()
+set(STLINK_LIB_SHARED ${PROJECT_NAME}-shared)
 
 add_library(${STLINK_LIB_SHARED} SHARED ${STLINK_HEADERS} ${STLINK_SOURCE})
 
@@ -195,6 +191,10 @@ install(TARGETS ${STLINK_LIB_SHARED} DESTINATION ${STLINK_LIBRARY_PATH})
 
 # Set library name
 set(STLINK_LIB_STATIC ${PROJECT_NAME}-static)
+set(STLINK_LIB_STATIC_OUTPUT_NAME ${PROJECT_NAME})
+if (MSVC)
+    set(STLINK_LIB_STATIC_OUTPUT_NAME ${PROJECT_NAME}-static)
+endif()
 
 add_library(${STLINK_LIB_STATIC} STATIC ${STLINK_HEADERS} ${STLINK_SOURCE})
 
@@ -206,7 +206,7 @@ message(STATUS "VERSION: ${STLINK_STATIC_VERSION}")
 set_target_properties(${STLINK_LIB_STATIC} PROPERTIES
         SOVERSION ${PROJECT_VERSION_MAJOR}
         VERSION ${STLINK_STATIC_VERSION}
-        OUTPUT_NAME ${PROJECT_NAME}
+        OUTPUT_NAME ${STLINK_LIB_STATIC_OUTPUT_NAME}
         )
 
 # Link static library

tests/CMakeLists.txt

@@ -4,13 +4,19 @@
 
 set(TESTEXEC usb sg)
 
+set(TEST_DEPENDENCY ${STLINK_LIB_SHARED})
+if (WIN32 OR APPLE)
+    set(TEST_DEPENDENCY ${STLINK_LIB_STATIC})
+endif()
+
 foreach (test ${TESTEXEC})
     add_executable(test-${test} ${test}.c)
-    add_dependencies(test-${test} ${STLINK_LIB_SHARED})
-    target_link_libraries(test-${test} ${STLINK_LIB_SHARED} ${SSP_LIB})
+    add_dependencies(test-${test} ${TEST_DEPENDENCY})
+    target_link_libraries(test-${test} ${TEST_DEPENDENCY} ${SSP_LIB})
     add_test(test-${test} ${CMAKE_BINARY_DIR}/bin/test-${test})
 endforeach ()
 
 add_executable(test-flash flash.c "${CMAKE_SOURCE_DIR}/src/st-flash/flash_opts.c")
-target_link_libraries(test-flash ${STLINK_LIB_SHARED} ${SSP_LIB})
+add_dependencies(test-flash ${TEST_DEPENDENCY})
+target_link_libraries(test-flash ${TEST_DEPENDENCY} ${SSP_LIB})
 add_test(test-flash ${CMAKE_BINARY_DIR}/bin/test-flash)